one more fix for locating the lensfun db in bundle mode
This commit is contained in:
@@ -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);
|
||||
|
@@ -60,7 +60,6 @@ extern Options options;
|
||||
Glib::ustring argv0;
|
||||
Glib::ustring creditsPath;
|
||||
Glib::ustring licensePath;
|
||||
Glib::ustring lensfunDbPath;
|
||||
Glib::ustring argv1;
|
||||
Glib::ustring argv2;
|
||||
bool simpleEditor = false;
|
||||
@@ -531,16 +530,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
|
||||
|
||||
|
||||
|
@@ -49,8 +49,6 @@ Options options;
|
||||
Glib::ustring versionString = RTVERSION;
|
||||
Glib::ustring paramFileExtension = ".pp3";
|
||||
|
||||
extern Glib::ustring lensfunDbPath; // defined in main
|
||||
|
||||
Options::Options ()
|
||||
{
|
||||
|
||||
@@ -729,8 +727,7 @@ void Options::setDefaults ()
|
||||
lastLensProfileDir = "";
|
||||
gimpPluginShowInfoDialog = true;
|
||||
maxRecentFolders = 15;
|
||||
|
||||
rtSettings.lensfunDbDirectory = lensfunDbPath;
|
||||
rtSettings.lensfunDbDirectory = ""; // set also in main.cc and main-cli.cc
|
||||
}
|
||||
|
||||
Options* Options::copyFrom (Options* other)
|
||||
|
Reference in New Issue
Block a user