Merge branch 'master' into gtk3

2017-01-02 02:48:45 +01:00
parent e9db962a5f d29a94c2a7
commit d702156f8a
20 changed files with 444 additions and 219 deletions
--- a/rtgui/guiutils.h
+++ b/rtgui/guiutils.h
@@ -553,9 +553,13 @@ public:

 inline void setActiveTextOrIndex (Gtk::ComboBoxText& comboBox, const Glib::ustring& text, int index)
 {
-    comboBox.set_active_text (text);
+    bool valueSet = false;
+    if (!text.empty()) {
+        comboBox.set_active_text (text);
+        valueSet = true;
+    }

-    if (comboBox.get_active_row_number () < 0) {
+    if (!valueSet || comboBox.get_active_row_number () < 0) {
        comboBox.set_active (index);
    }
 }