From 415772254f4cb8016bee46e0d27d3770435c47c9 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Thu, 18 Oct 2018 11:41:00 +0200 Subject: [PATCH] 'processing profile -> reset to default' and 'processing profile -> clear' seem broken, fixes #4874 --- rtgui/filebrowser.cc | 2 +- rtgui/thumbnail.cc | 5 +++-- rtgui/thumbnail.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index c22ee6c1a..f83e39146 100644 --- a/rtgui/filebrowser.cc +++ b/rtgui/filebrowser.cc @@ -981,7 +981,7 @@ void FileBrowser::menuItemActivated (Gtk::MenuItem* m) // Empty run to update the thumb rtengine::procparams::ProcParams params = mselected[i]->thumbnail->getProcParams (); - mselected[i]->thumbnail->setProcParams (params, nullptr, FILEBROWSER); + mselected[i]->thumbnail->setProcParams (params, nullptr, FILEBROWSER, true, true); } if (!mselected.empty() && bppcl) { diff --git a/rtgui/thumbnail.cc b/rtgui/thumbnail.cc index 0f0433878..c2d23eab2 100644 --- a/rtgui/thumbnail.cc +++ b/rtgui/thumbnail.cc @@ -417,10 +417,11 @@ bool Thumbnail::hasProcParams () const return pparamsValid; } -void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoChangedIt, bool updateCacheNow) +void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoChangedIt, bool updateCacheNow, bool resetToDefault) { const bool needsReprocessing = - pparams.toneCurve != pp.toneCurve + resetToDefault + || pparams.toneCurve != pp.toneCurve || pparams.labCurve != pp.labCurve || pparams.localContrast != pp.localContrast || pparams.rgbCurves != pp.rgbCurves diff --git a/rtgui/thumbnail.h b/rtgui/thumbnail.h index 93d85cc01..ae627c22f 100644 --- a/rtgui/thumbnail.h +++ b/rtgui/thumbnail.h @@ -87,7 +87,7 @@ public: // Use this to create params on demand for update ; if flaggingMode=true, the procparams is created for a file being flagged (inTrash, rank, colorLabel) rtengine::procparams::ProcParams* createProcParamsForUpdate (bool returnParams, bool force, bool flaggingMode = false); - void setProcParams (const rtengine::procparams::ProcParams& pp, ParamsEdited* pe = nullptr, int whoChangedIt = -1, bool updateCacheNow = true); + void setProcParams (const rtengine::procparams::ProcParams& pp, ParamsEdited* pe = nullptr, int whoChangedIt = -1, bool updateCacheNow = true, bool resetToDefault = false); void clearProcParams (int whoClearedIt = -1); void loadProcParams ();