merge with Dev

This commit is contained in:
Desmis
2017-09-20 17:47:16 +02:00
3 changed files with 15 additions and 3 deletions

View File

@@ -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