From 78209d3c96d3c771a7e0f5f87d952a764a950b55 Mon Sep 17 00:00:00 2001 From: Lawrence Lee Date: Sun, 24 Jan 2021 18:10:02 -0800 Subject: [PATCH] Fix color label with default profile bug Prevent the color label, rating, and trash status from being reset when resetting a photo to the default processing profile. Closes #5936. --- rtgui/filebrowser.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index a8ce94e7f..0d2451b59 100644 --- a/rtgui/filebrowser.cc +++ b/rtgui/filebrowser.cc @@ -985,11 +985,19 @@ void FileBrowser::menuItemActivated (Gtk::MenuItem* m) } for (size_t i = 0; i < mselected.size(); i++) { - mselected[i]->thumbnail->createProcParamsForUpdate (false, true); + const auto thumbnail = mselected[i]->thumbnail; + const auto rank = thumbnail->getRank(); + const auto colorLabel = thumbnail->getColorLabel(); + const auto stage = thumbnail->getStage(); + + thumbnail->createProcParamsForUpdate (false, true); + thumbnail->setRank(rank); + thumbnail->setColorLabel(colorLabel); + thumbnail->setStage(stage); // Empty run to update the thumb - rtengine::procparams::ProcParams params = mselected[i]->thumbnail->getProcParams (); - mselected[i]->thumbnail->setProcParams (params, nullptr, FILEBROWSER, true, true); + rtengine::procparams::ProcParams params = thumbnail->getProcParams (); + thumbnail->setProcParams (params, nullptr, FILEBROWSER, true, true); } if (!mselected.empty() && bppcl) {