merge with Dev

2017-09-20 17:47:16 +02:00
parent 281b196b8b a1f86bff53
commit bdbe008d61
3 changed files with 15 additions and 3 deletions
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -24,7 +24,6 @@
 #include "addsetids.h"
 #include "guiutils.h"
 #include "version.h"
-#include "config.h"

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

 Options* Options::copyFrom (Options* other)