From 4313cfc74c2a472e3c6b54282ae64bf43ca3d239 Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Mon, 25 Sep 2017 12:09:40 +0200
Subject: [PATCH 1/3] fixed default value of lensfunDbDirectory when
 BUILD_BUNDLE is set

---
 rtgui/main.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rtgui/main.cc b/rtgui/main.cc
index ce212daf2..9548bb289 100644
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -529,7 +529,7 @@ int main (int argc, char **argv)
         licensePath = Glib::build_filename (exePath, LICENCE_SEARCH_PATH);
     }
 
-    if (Glib::path_is_absolute (LENSFUN_DB_PATH)) {
+    if (strlen(LENSFUN_DB_PATH) == 0 || Glib::path_is_absolute (LENSFUN_DB_PATH)) {
         options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
     } else {
         options.rtSettings.lensfunDbDirectory = Glib::build_filename (exePath, LENSFUN_DB_PATH);

From 31095d3a9d9ca701e6271b36d37cc25d27a272d1 Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Mon, 25 Sep 2017 13:14:21 +0200
Subject: [PATCH 2/3] Use assign instead of clear and resize

---
 rtgui/options.cc     | 3 +--
 rtgui/preferences.cc | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/rtgui/options.cc b/rtgui/options.cc
index 45f4896d6..49c213ebd 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -511,8 +511,7 @@ void Options::setDefaults ()
 #endif
 
     // 0 = SET mode, 1 = ADD mode
-    baBehav.clear();
-    baBehav.resize(ADDSET_PARAM_NUM, 0);
+    baBehav.assign(ADDSET_PARAM_NUM, 0);
 
     rtSettings.darkFramesPath = "";
     rtSettings.flatFieldsPath = "";
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index b228c4dc7..d6907a933 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -2563,8 +2563,7 @@ bool Preferences::splashClosed (GdkEventAny* event)
 
 void Preferences::behAddSetAllPressed (bool add)
 {
-    moptions.baBehav.clear();
-    moptions.baBehav.resize(ADDSET_PARAM_NUM, add);
+    moptions.baBehav.assign(ADDSET_PARAM_NUM, add);
     for (Gtk::TreeIter sections = behModel->children().begin(); sections != behModel->children().end(); ++sections) {
         for (Gtk::TreeIter adjs = sections->children().begin(); adjs != sections->children().end(); ++adjs) {
             adjs->set_value(behavColumns.badd, add);

From be39ef32603bb5b9a280413c64b182c6c2519a33 Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Tue, 26 Sep 2017 00:10:23 +0200
Subject: [PATCH 3/3] allow to use a relative path for Lensfun.DBDirectory in
 options

---
 rtengine/init.cc  | 6 +++++-
 rtgui/main-cli.cc | 6 +-----
 rtgui/main.cc     | 6 +-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/rtengine/init.cc b/rtengine/init.cc
index 7ac4ca35b..41f599b01 100644
--- a/rtengine/init.cc
+++ b/rtengine/init.cc
@@ -51,7 +51,11 @@ int init (const Settings* s, Glib::ustring baseDir, Glib::ustring userSettingsDi
     Color::init ();
     PerceptualToneCurve::init ();
     RawImageSource::init ();
-    LFDatabase::init(s->lensfunDbDirectory);
+    if (s->lensfunDbDirectory.empty() || Glib::path_is_absolute(s->lensfunDbDirectory)) {
+        LFDatabase::init(s->lensfunDbDirectory);
+    } else {
+        LFDatabase::init(Glib::build_filename(baseDir, s->lensfunDbDirectory));
+    }
     delete lcmsMutex;
     lcmsMutex = new MyMutex;
     dfm.init( s->darkFramesPath );
diff --git a/rtgui/main-cli.cc b/rtgui/main-cli.cc
index 74f2e1b65..1cb63ef6d 100644
--- a/rtgui/main-cli.cc
+++ b/rtgui/main-cli.cc
@@ -145,11 +145,7 @@ 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);
-    }
+    options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
 
 #else
     argv0 = DATA_SEARCH_PATH;
diff --git a/rtgui/main.cc b/rtgui/main.cc
index 9548bb289..6dd9ccf7f 100644
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -529,11 +529,7 @@ int main (int argc, char **argv)
         licensePath = Glib::build_filename (exePath, LICENCE_SEARCH_PATH);
     }
 
-    if (strlen(LENSFUN_DB_PATH) == 0 || Glib::path_is_absolute (LENSFUN_DB_PATH)) {
-        options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
-    } else {
-        options.rtSettings.lensfunDbDirectory = Glib::build_filename (exePath, LENSFUN_DB_PATH);
-    }
+    options.rtSettings.lensfunDbDirectory = LENSFUN_DB_PATH;
     
 #else
     argv0 = DATA_SEARCH_PATH;