one more fix for locating the lensfun db in bundle mode

This commit is contained in:
Alberto Griggio
2017-09-17 16:45:54 +02:00
parent 6d453dbd34
commit 6f7ca3f5ec
3 changed files with 7 additions and 12 deletions

View File

@@ -59,7 +59,6 @@ Glib::ustring argv0;
Glib::ustring creditsPath;
Glib::ustring licensePath;
Glib::ustring argv1;
Glib::ustring lensfunDbPath;
//bool simpleEditor;
//Glib::Threads::Thread* mainThread;
@@ -147,16 +146,16 @@ int main (int argc, char **argv)
}
if (Glib::path_is_absolute(LENSFUN_DB_PATH)) {
lensfunDbPath = LENSFUN_DB_PATH;
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
} else {
lensfunDbPath = Glib::build_filename(exePath, LENSFUN_DB_PATH);
options.rtSettings.lensfunDbDirectory = Glib::build_filename(exePath, LENSFUN_DB_PATH);
}
#else
argv0 = DATA_SEARCH_PATH;
creditsPath = CREDITS_SEARCH_PATH;
licensePath = LICENCE_SEARCH_PATH;
lensfunDbPath = LENSFUN_DB_PATH;
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
#endif
bool quickstart = dontLoadCache (argc, argv);