merge with Dev

2017-09-26 12:44:10 +02:00
parent 8b7c3ab0a5 be39ef3260
commit b7a0b6c1aa
5 changed files with 9 additions and 15 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -530,11 +530,7 @@ 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);
-    }
+    options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
    
 #else
    argv0 = DATA_SEARCH_PATH;