Jobs can now be aborted from the "running job" view

[kdenlive] / renderer / renderjob.cpp

diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
index 13be2397132c0742f91928405572dc09e8a77ca6..7c2448b6e92c82052a170a0e0e636ce97f8975bb 100644 (file)
--- a/renderer/renderjob.cpp
+++ b/renderer/renderjob.cpp
@@ -80,9 +80,18 @@ RenderJob::~RenderJob() {
     m_logfile.close();
 }
 
+void RenderJob::slotAbort(const QString& url) {
+    if (m_dest == url) slotAbort();
+}
+
 void RenderJob::slotAbort() {
     qDebug() << "Kdenlive-render: JOB ABORTED BY USER...";
     m_renderProcess->kill();
+
+    if (m_kdenliveinterface) {
+        m_dbusargs[1] = -3;
+        m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs);
+    }
     if (m_jobUiserver) m_jobUiserver->call("terminate", QString());
     if (m_erase) {
         QFile f(m_scenelist);
@@ -173,6 +182,8 @@ void RenderJob::start() {
         m_dbusargs.append(m_dest);
         m_dbusargs.append((int) 0);
         m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs);
+        connect(m_kdenliveinterface, SIGNAL(abortRenderJob(const QString &)),
+                this, SLOT(slotAbort(const QString&)));
     }
 
     // Because of the logging, we connect to stderr in all cases.