Segfault when pasting a copied profile with retinex filter, fixes #2913

2015-09-22 17:26:40 +02:00
parent bedd95e181
commit 5f2151ba4d
3 changed files with 8 additions and 3 deletions
--- a/rtgui/paramsedited.cc
+++ b/rtgui/paramsedited.cc
@@ -2681,3 +2681,8 @@ bool LensProfParamsEdited::isUnchanged() const
 {
    return lcpFile;
 }
+
+bool RetinexParamsEdited::isUnchanged() const
+{
+    return enabled && retinexcolorspace && gammaretinex && gam && slope;
+}
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -77,7 +77,7 @@ public:
    bool cdHcurve;
    bool retinex;
    bool medianmap;
-
+    bool isUnchanged() const;
 };


--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -396,7 +396,7 @@ void ToolPanelCoordinator::profileChange  (const PartialProfile *nparams, rtengi
        lParams[1] = *mergedParams;
        pe.initFrom (lParams);

-        filterRawRefresh = pe.raw.isUnchanged() && pe.lensProf.isUnchanged();
+        filterRawRefresh = pe.raw.isUnchanged() && pe.lensProf.isUnchanged() && pe.retinex.isUnchanged();
    }

    *params = *mergedParams;