Try to make sure we don't create url's with // in them

[kdenlive] / src / initeffects.cpp

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index 9a368ac51438f3147b0ddb3b65b6c8c4b5775bcc..bfba26def1c0603d97ddc66972b3f4f7636cb44a 100644 (file)
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -76,18 +76,18 @@ void initEffects::refreshLumas()
         QStringList filesnames = QDir(folder).entryList(filters, QDir::Files);
         foreach(const QString &fname, filesnames) {
             imagenamelist.append(fname);
-            imagefiles.append(folder + '/' + fname);
+            imagefiles.append(KUrl(folder).path(KUrl::AddTrailingSlash) + fname);
         }
     }
 
     // Check for MLT lumas
-    QString folder = mlt_environment("MLT_DATA");
-    folder.append("/lumas/").append(mlt_environment("MLT_NORMALISATION"));
+    QString folder = KUrl(mlt_environment("MLT_DATA")).path(KUrl::AddTrailingSlash);
+    folder.append("lumas/").append(mlt_environment("MLT_NORMALISATION"));
     QDir lumafolder(folder);
     QStringList filesnames = lumafolder.entryList(filters, QDir::Files);
     foreach(const QString &fname, filesnames) {
         imagenamelist.append(fname);
-        imagefiles.append(folder + '/' + fname);
+        imagefiles.append(folder + fname);
     }
     QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", "luma");
     QDomNodeList params = lumaTransition.elementsByTagName("parameter");
@@ -657,13 +657,13 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
             }
 
             // Check for MLT lumas
-            QString folder = mlt_environment("MLT_DATA");
-            folder.append("/lumas/").append(mlt_environment("MLT_NORMALISATION"));
+            QString folder = KUrl(mlt_environment("MLT_DATA")).path(KUrl::AddTrailingSlash);
+            folder.append("lumas/").append(mlt_environment("MLT_NORMALISATION"));
             QDir lumafolder(folder);
             QStringList filesnames = lumafolder.entryList(filters, QDir::Files);
             foreach(const QString &fname, filesnames) {
                 imagenamelist.append(fname);
-                imagefiles.append(folder + '/' + fname);
+                imagefiles.append(folder + fname);
             }
 
             if (name == "luma") {