Merge branch 'gtk3' into gtk3-bugfix

2016-11-12 01:19:27 +01:00
parent cbd0060bcd 024905a8ca
commit b3167eadce
13 changed files with 131 additions and 46 deletions
--- a/rtgui/exifpanel.cc
+++ b/rtgui/exifpanel.cc
@@ -461,7 +461,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);
        }