liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjustments in Batch Edit sometimes clear the HaldCLUT combo box, fixes #4720

Browse Source
This commit is contained in:
heckflosse
2018-09-18 14:28:39 +02:00
parent 1b5d7ea628
commit 260d7fadf9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/filmsimulation.cc
View File

@@ -135,6 +135,8 @@ void FilmSimulation::read( const rtengine::procparams::ProcParams* pp, const Par
: pp->filmSimulation.clutFilename : pp->filmSimulation.clutFilename
); );
m_oldClutFilename = m_clutComboBox->getSelectedClut(); m_oldClutFilename = m_clutComboBox->getSelectedClut();
} else {
m_clutComboBox->set_active(-1);
} }
m_strength->setValue(pp->filmSimulation.strength); m_strength->setValue(pp->filmSimulation.strength);
@@ -249,7 +251,7 @@ void ClutComboBox::setBatchMode(bool yes)
if (batchMode != yes) { if (batchMode != yes) {
batchMode = yes; batchMode = yes;
set_model(m_model()); set_model(m_model());
if (batchMode && options.multiDisplayMode) { if (batchMode) {
updateUnchangedEntry(); updateUnchangedEntry();
} }
} }
@@ -270,7 +272,6 @@ void ClutComboBox::updateUnchangedEntry()
if (c.size() > 0) { if (c.size() > 0) {
Gtk::TreeModel::Row row = c[c.size()-1]; Gtk::TreeModel::Row row = c[c.size()-1];
if (row[m_columns().clutFilename] == "NULL") { if (row[m_columns().clutFilename] == "NULL") {
std::cout << " removing " << ((void *)this) << std::endl;
m_model()->erase(row); m_model()->erase(row);
} }
} }