Merge pull request #3033 from adamreichold/fix-snapshot-selection-on-photo-load

Fixes #2914 Block bookmark changes when switching images
2015-12-20 23:26:25 +01:00
parent 8ae520e794 551f5ec5f3
commit f1128338b3
1 changed files with 2 additions and 0 deletions
--- a/rtgui/history.cc
+++ b/rtgui/history.cc
@@ -230,6 +230,7 @@ void History::procParamsChanged (ProcParams* params, ProcEvent ev, Glib::ustring
    }

    selchangehist.block (true);
+    selchangebm.block (true);

    if (ev == EvPhotoLoaded) {
        initHistory ();
@@ -303,6 +304,7 @@ void History::procParamsChanged (ProcParams* params, ProcEvent ev, Glib::ustring
    }

    selchangehist.block (false);
+    selchangebm.block (false);
 }

 void History::addBookmarkWithText (Glib::ustring text)