merge with Dev

2017-09-20 17:47:16 +02:00
parent 281b196b8b a1f86bff53
commit bdbe008d61
3 changed files with 15 additions and 3 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -530,10 +530,17 @@ int main (int argc, char **argv)
        licensePath = Glib::build_filename (exePath, LICENCE_SEARCH_PATH);
    }

+    if (Glib::path_is_absolute (LENSFUN_DB_PATH)) {
+        options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
+    } else {
+        options.rtSettings.lensfunDbDirectory = Glib::build_filename (exePath, LENSFUN_DB_PATH);
+    }
+    
 #else
    argv0 = DATA_SEARCH_PATH;
    creditsPath = CREDITS_SEARCH_PATH;
    licensePath = LICENCE_SEARCH_PATH;
+    options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
 #endif