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

Merge master into gtk3

Browse Source
This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/history.cc
View File

@@ -26,7 +26,7 @@ using namespace rtengine::procparams;
Glib::ustring eventDescrArray[NUMOFEVENTS];
History::History (bool bookmarkSupport) : blistener(NULL), tpc (NULL), bmnum (1)
History::History (bool bookmarkSupport) : blistener(nullptr), tpc (nullptr), bmnum (1)
{
blistenerLock = false; // sets default that the Before preview will not be locked
@@ -187,7 +187,7 @@ void History::historySelectionChanged ()
tpc->profileChange (&pp, EvHistoryBrowsed, row[historyColumns.text], &paramsEdited);
}
if (blistener && blistenerLock == false) {
if (blistener && !blistenerLock) {
Gtk::TreeModel::Path path = historyModel->get_path (iter);
path.prev ();
iter = historyModel->get_iter (path);
@@ -274,9 +274,9 @@ void History::procParamsChanged (ProcParams* params, ProcEvent ev, Glib::ustring
selection->select (newrow);
}
if (blistener && row && blistenerLock == false) {
if (blistener && row && !blistenerLock) {
blistener->historyBeforeLineChanged (row[historyColumns.params]);
} else if (blistener && size == 0 && blistenerLock == false) {
} else if (blistener && size == 0 && !blistenerLock) {
blistener->historyBeforeLineChanged (newrow[historyColumns.params]);
}
}