Merge branch 'dev' into metadata-exiv2

2019-07-09 13:34:19 +02:00
parent 8df4973610 3b78a5c227
commit 21a97980b6
70 changed files with 1341 additions and 1103 deletions
--- a/rtengine/ffmanager.cc
+++ b/rtengine/ffmanager.cc
@@ -231,8 +231,11 @@ void ffInfo::updateRawImage()

 // ************************* class FFManager *********************************

-void FFManager::init( Glib::ustring pathname )
+void FFManager::init(const Glib::ustring& pathname)
 {
+    if (pathname.empty()) {
+        return;
+    }
    std::vector<Glib::ustring> names;

    auto dir = Gio::File::create_for_path (pathname);