merge with dev

2017-03-12 16:53:50 +01:00
parent 90e66b6fc1 ebd9e5e132
commit 11940f9121
70 changed files with 2305 additions and 488 deletions
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -245,6 +245,10 @@ Glib::ustring Options::findProfilePath (Glib::ustring &profName)
        return profName;
    }

+    if (profName == DEFPROFILE_DYNAMIC) {
+        return profName;
+    }
+
    Glib::ustring p = profName.substr (0, 4);

    if (p == "${U}") {