liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with Dev

Browse Source
This commit is contained in:
Desmis
2017-09-20 17:47:16 +02:00
parent 281b196b8b a1f86bff53
commit bdbe008d61
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtgui/main-cli.cc
View File

@@ -145,10 +145,17 @@ int main (int argc, char **argv)
licensePath = Glib::build_filename (exePath, LICENCE_SEARCH_PATH); 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 #else
argv0 = DATA_SEARCH_PATH; argv0 = DATA_SEARCH_PATH;
creditsPath = CREDITS_SEARCH_PATH; creditsPath = CREDITS_SEARCH_PATH;
licensePath = LICENCE_SEARCH_PATH; licensePath = LICENCE_SEARCH_PATH;
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
#endif #endif
bool quickstart = dontLoadCache (argc, argv); bool quickstart = dontLoadCache (argc, argv);

7
rtgui/main.cc
View File

@@ -530,10 +530,17 @@ int main (int argc, char **argv)
licensePath = Glib::build_filename (exePath, LICENCE_SEARCH_PATH); 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 #else
argv0 = DATA_SEARCH_PATH; argv0 = DATA_SEARCH_PATH;
creditsPath = CREDITS_SEARCH_PATH; creditsPath = CREDITS_SEARCH_PATH;
licensePath = LICENCE_SEARCH_PATH; licensePath = LICENCE_SEARCH_PATH;
options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
#endif #endif

4
rtgui/options.cc
View File

@@ -24,7 +24,6 @@
#include "addsetids.h" #include "addsetids.h"
#include "guiutils.h" #include "guiutils.h"
#include "version.h" #include "version.h"
#include "config.h"
#ifdef _OPENMP #ifdef _OPENMP
#include <omp.h> #include <omp.h>
@@ -745,8 +744,7 @@ void Options::setDefaults ()
lastLensProfileDir = ""; lastLensProfileDir = "";
gimpPluginShowInfoDialog = true; gimpPluginShowInfoDialog = true;
maxRecentFolders = 15; maxRecentFolders = 15;
rtSettings.lensfunDbDirectory = ""; // set also in main.cc and main-cli.cc
rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
} }
Options* Options::copyFrom (Options* other) Options* Options::copyFrom (Options* other)