Merge branch 'dev' into alert-after-splash

2018-02-26 17:37:23 +01:00
parent b430ca19a6 af59dc5cc6
commit 046e0d6c93
8 changed files with 20 additions and 22 deletions
--- a/rtgui/filmsimulation.cc
+++ b/rtgui/filmsimulation.cc
@@ -425,6 +425,8 @@ void ClutComboBox::setSelectedClut( Glib::ustring filename )

        if ( found ) {
            set_active( found );
+        } else {
+            set_active(-1);
        }
    }
 }