From 7b3e9f7b7a0ff7cbc4999fa6c8d0809d0aedbee1 Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Thu, 18 Jan 2018 17:55:14 +0100
Subject: [PATCH] fixed bad interaction between auto levels and histogram
 matching

---
 rtengine/improccoordinator.cc | 3 ++-
 rtengine/simpleprocess.cc     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index 37241bbe0..75fc81e9f 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -445,7 +445,8 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
             if (aeListener)
                 aeListener->autoExpChanged (params.toneCurve.expcomp, params.toneCurve.brightness, params.toneCurve.contrast,
                                             params.toneCurve.black, params.toneCurve.hlcompr, params.toneCurve.hlcomprthresh, params.toneCurve.hrenabled);
-        } else if (params.toneCurve.histmatching) {
+        }
+        if (params.toneCurve.histmatching) {
             imgsrc->getAutoMatchedToneCurve(params.toneCurve.curve);
 
             params.toneCurve.histmatching = false;
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index 2910b6b43..0bd784e45 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -739,7 +739,8 @@ private:
             int aehistcompr;
             imgsrc->getAutoExpHistogram (aehist, aehistcompr);
             ipf.getAutoExp (aehist, aehistcompr, params.toneCurve.clip, expcomp, bright, contr, black, hlcompr, hlcomprthresh);
-        } else if (params.toneCurve.histmatching) {
+        }
+        if (params.toneCurve.histmatching) {
             imgsrc->getAutoMatchedToneCurve(params.toneCurve.curve);
 
             params.toneCurve.histmatching = false;