Fix multiple stabilize jobs: http://kdenlive.org/mantis/view.php?id=2771

diff --git a/src/clipstabilize.cpp b/src/clipstabilize.cpp
index 30a265d01640536b4424c94058e58cecbcac769f..23345f5319e620dc6fd2825a523c9e9791cb030e 100644 (file)
--- a/src/clipstabilize.cpp
+++ b/src/clipstabilize.cpp
@@ -166,7 +166,7 @@ QString ClipStabilize::destination() const
     if (m_count == 1)
         return dest_url->url().path();
     else
-        return dest_url->url().directory(KUrl::AppendTrailingSlash);
+        return dest_url->url().path(KUrl::AddTrailingSlash);
 }
 
 QString ClipStabilize::desc() const

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index e0ff8d2a3a8f3ff45164fc6003096690147d17fe..b6358b8c3015b3fceda98ea336c38a0cf102c004 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -3462,15 +3462,17 @@ void ProjectList::processClipJob(QStringList ids, const QString&destination, boo
     foreach(const QString&id, ids) {
         ProjectItem *item = getItemById(id);
         if (!item) continue;
+       QStringList jobArgs;
+       jobArgs << preParams;
         if (ids.count() == 1) {
-            consumer += ':' + destination;
+            jobArgs << consumer + ':' + destination;
         }
         else {
-            consumer += ':' + destination + item->clipUrl().fileName() + ".mlt";
+            jobArgs << consumer + ':' + destination + item->clipUrl().fileName() + ".mlt";
         }
-        preParams << consumer << jobParams;
+        jobArgs << jobParams;
         
-        MeltJob *job = new MeltJob(item->clipType(), id, preParams);
+        MeltJob *job = new MeltJob(item->clipType(), id, jobArgs);
         if (autoAdd) {
             job->setAddClipToProject(true);
             kDebug()<<"// ADDING TRUE";