From 9bfd2d60d3a24064f6c3161410bf42f195351c55 Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Thu, 7 Sep 2017 17:50:33 +0200
Subject: [PATCH] fixed update of lensfun-related procparams after editing

---
 rtgui/lensprofile.cc  |  9 ++++++---
 rtgui/paramsedited.cc | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc
index 82e156199..7ac67e106 100644
--- a/rtgui/lensprofile.cc
+++ b/rtgui/lensprofile.cc
@@ -140,7 +140,6 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
     disableListener ();
     conUseDist.block(true);
 
-    corrOff->set_active(true);
     if (pp->lensProf.useLensfun) {
         if (pp->lensProf.lfAutoMatch) {
             corrLensfunAuto->set_active(true);
@@ -164,6 +163,8 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
         }
 
         updateDisabled(false);
+
+        corrOff->set_active(true);
     }
 
     ckbUseDist->set_active (pp->lensProf.useDist);
@@ -415,6 +416,7 @@ void LensProfilePanel::onCorrModeChanged()
 
     if (corrOff->get_active()) {
         useLensfunChanged = true;
+        lensfunAutoChanged = true;
         lcpFileChanged = true;
         
         lensfunCameras->set_sensitive(false);
@@ -426,6 +428,7 @@ void LensProfilePanel::onCorrModeChanged()
         mode = M("LENSPROFILE_CORRECTION_OFF");
     } else if (corrLensfunAuto->get_active()) {
         useLensfunChanged = true;
+        lensfunAutoChanged = true;
         lcpFileChanged = true;
         useDistChanged = true;
         useVignChanged = true;
@@ -440,7 +443,7 @@ void LensProfilePanel::onCorrModeChanged()
         mode = M("LENSPROFILE_CORRECTION_AUTOMATCH");
     } else if (corrLensfunManual->get_active()) {
         useLensfunChanged = true;
-        lcpFileChanged = true;
+        lensfunAutoChanged = true;
         lcpFileChanged = true;
         useDistChanged = true;
         useVignChanged = true;
@@ -455,7 +458,7 @@ void LensProfilePanel::onCorrModeChanged()
         mode = M("LENSPROFILE_CORRECTION_MANUAL");
     } else if (corrLcpFile->get_active()) {
         useLensfunChanged = true;
-        lcpFileChanged = true;
+        lensfunAutoChanged = true;
         lcpFileChanged = true;
         useDistChanged = true;
         useVignChanged = true;
diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc
index 588006eca..e5c995f90 100644
--- a/rtgui/paramsedited.cc
+++ b/rtgui/paramsedited.cc
@@ -2078,6 +2078,26 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
         toEdit.lensProf.useCA           = mods.lensProf.useCA;
     }
 
+    if (lensProf.useLensfun) {
+        toEdit.lensProf.useLensfun = mods.lensProf.useLensfun;
+    }
+
+    if (lensProf.lfAutoMatch) {
+        toEdit.lensProf.lfAutoMatch = mods.lensProf.lfAutoMatch;
+    }
+
+    if (lensProf.lfCameraMake) {
+        toEdit.lensProf.lfCameraMake = mods.lensProf.lfCameraMake;
+    }
+
+    if (lensProf.lfCameraModel) {
+        toEdit.lensProf.lfCameraModel = mods.lensProf.lfCameraModel;
+    }
+
+    if (lensProf.lfLens) {
+        toEdit.lensProf.lfLens = mods.lensProf.lfLens;
+    }
+
     if (perspective.horizontal) {
         toEdit.perspective.horizontal     = dontforceSet && options.baBehav[ADDSET_PERSPECTIVE] ? toEdit.perspective.horizontal + mods.perspective.horizontal : mods.perspective.horizontal;
     }