From: Jean-Baptiste Mardelle Date: Mon, 8 Oct 2012 22:14:15 +0000 (+0200) Subject: Fix multiple stabilize jobs: http://kdenlive.org/mantis/view.php?id=2771 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b302d3e65c80d31754d8afa4d5823f895d77e84d;p=kdenlive Fix multiple stabilize jobs: http://kdenlive.org/mantis/view.php?id=2771 --- diff --git a/src/clipstabilize.cpp b/src/clipstabilize.cpp index 30a265d0..23345f53 100644 --- 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 e0ff8d2a..b6358b8c 100644 --- 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";