Merge branch 'master' into buildsystem

[kdenlive] / src / projectsettings.cpp

diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp
index 270845f3c73d64b496e0755945892a420b827045..0504ba827552e0af64caa4553c26606a192fec7d 100644 (file)
--- a/src/projectsettings.cpp
+++ b/src/projectsettings.cpp
@@ -104,7 +104,7 @@ ProjectSettings::ProjectSettings(ProjectList *projectlist, QStringList lumas, in
         if (!k.key().isEmpty()) {
             QString params = k.value().section(';', 0, 0);
             QString extension = k.value().section(';', 1, 1);
-            if (params == proxyparameters && extension == proxyextension) {
+            if (ix == -1 && ((params == proxyparameters && extension == proxyextension) || (proxyparameters.isEmpty() || proxyextension.isEmpty()))) {
                 // this is the current profile
                 ix = proxy_profile->count();
             }