merge with dev

2019-06-26 07:37:29 +02:00
parent 1c22559448 66c9cd6177
commit 5a59c90b62
18 changed files with 883 additions and 728 deletions
--- a/rtgui/filmsimulation.cc
+++ b/rtgui/filmsimulation.cc
@@ -300,7 +300,7 @@ ClutComboBox::ClutModel::ClutModel(const Glib::ustring &path)
 {
    m_model = Gtk::TreeStore::create (m_columns);
    //set_model (m_model);
-    count = parseDir(path);
+    count = path.empty() ? 0 : parseDir(path);
 }

 int ClutComboBox::ClutModel::parseDir(const Glib::ustring& path)