Merge branch 'dev' into std-mutex

2019-12-29 00:40:02 +01:00
parent 808da1b8a3 fbc7455ead
commit aead20e380
4 changed files with 46 additions and 36 deletions
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -921,7 +921,8 @@ void RTWindow::writeToolExpandedStatus (std::vector<int> &tpOpen)

 void RTWindow::showRawPedia()
 {
-    show_uri("https://rawpedia.rawtherapee.com/", GDK_CURRENT_TIME);
+    GError* gerror = nullptr;
+    gtk_show_uri(nullptr, "https://rawpedia.rawtherapee.com/", GDK_CURRENT_TIME, &gerror);
 }

 void RTWindow::showICCProfileCreator ()