Merge branch 'master' into gtk3

2016-11-11 23:05:29 +01:00
parent a961325397 7cb8781910
commit 024905a8ca
15 changed files with 1903 additions and 46 deletions
--- a/rtgui/exifpanel.cc
+++ b/rtgui/exifpanel.cc
@@ -449,7 +449,7 @@ void ExifPanel::addPressed ()
    } else {
        tcombo->set_active_text (sel);

-        if (tcombo->get_active () < 0) {
+        if (!tcombo->get_active ()) {
            tcombo->append (sel);
            tcombo->set_active_text (sel);
        }