From 45fcbe90528edebf5068d60a7bda8ba66cfde6ce Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Sat, 24 Mar 2018 10:28:43 +0100
Subject: [PATCH] Fix broken colour toning when b&w is enabled

---
 rtengine/improcfun.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index 0d27db3e0..ad98f10c9 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -5408,7 +5408,7 @@ void ImProcFunctions::luminanceCurve (LabImage* lold, LabImage* lnew, LUTf & cur
 void ImProcFunctions::chromiLuminanceCurve (PipetteBuffer *pipetteBuffer, int pW, LabImage* lold, LabImage* lnew, LUTf & acurve, LUTf & bcurve, LUTf & satcurve, LUTf & lhskcurve, LUTf & clcurve, LUTf & curve, bool utili, bool autili, bool butili, bool ccutili, bool cclutili, bool clcutili, LUTu &histCCurve, LUTu &histLCurve)
 {
     if (!params->labCurve.enabled) {
-        if (params->blackwhite.enabled) {
+        if (params->blackwhite.enabled && !params->colorToning.enabled) {
             for (int i = 0; i < lnew->H; ++i) {
                 for (int j = 0; j < lnew->W; ++j) {
                     lnew->a[i][j] = lnew->b[i][j] = 0.f;