[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] renderer: Fix rendering crash on finish
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-11-12 11:04:38
Message-ID: E1c5W6w-00076q-Hs () code ! kde ! org
[Download RAW message or body]

Git commit f3002dd8d31de218d3f8797cfd8b93647760a9cb by Jean-Baptiste Mardelle.
Committed on 12/11/2016 at 11:04.
Pushed by mardelle into branch 'master'.

Fix rendering crash on finish
CCBUG: 371478

M  +2    -1    renderer/renderjob.cpp

http://commits.kde.org/kdenlive/f3002dd8d31de218d3f8797cfd8b93647760a9cb

diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
index 16a23db..5bfd1ac 100644
--- a/renderer/renderjob.cpp
+++ b/renderer/renderjob.cpp
@@ -282,7 +282,7 @@ void RenderJob::slotIsOver(QProcess::ExitStatus status, bool \
                isWritable)
             m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, \
QStringLiteral("setRenderingFinished"), m_dbusargs);  }
         m_logstream << "Rendering of " << m_dest << " finished" << endl;
-        if (!m_dualpass && !m_player.isEmpty()) {
+        if (!m_dualpass && m_player.length() > 3 && m_player.contains(QLatin1Char(' \
'))) {  QStringList args = m_player.split(QLatin1Char(' '));
             QString exec = args.takeFirst();
             // Decode url
@@ -290,6 +290,7 @@ void RenderJob::slotIsOver(QProcess::ExitStatus status, bool \
isWritable)  args << url;
             QProcess::startDetached(exec, args);
         }
+        m_logstream.flush();
         if (m_dualpass) {
             emit renderingFinished();
             deleteLater();


[prev in list] [next in list] [prev in thread] [next in thread]