Improve feedback when a job fails (needs KDE >= 4.7) using messagewidget that shows...

[kdenlive] / src / projecttree / proxyclipjob.cpp

diff --git a/src/projecttree/proxyclipjob.cpp b/src/projecttree/proxyclipjob.cpp
index 9ff69087e0855e18f3e7891f7da94eecec031788..31a67bbf681252f522b13ae660f52306e2983c31 100644 (file)
--- a/src/projecttree/proxyclipjob.cpp
+++ b/src/projecttree/proxyclipjob.cpp
@@ -140,6 +140,8 @@ QProcess *ProxyJob::startJob(bool *ok)
         m_jobProcess->setProcessChannelMode(QProcess::MergedChannels);
         m_jobProcess->start("ffmpeg", parameters);
         m_jobProcess->waitForStarted();
+        QString log = m_jobProcess->readAll();
+        if (!log.isEmpty()) m_errorMessage.append(log + '\n');
        return m_jobProcess;
     }
 }
@@ -148,6 +150,7 @@ int ProxyJob::processLogInfo()
 {
     if (!m_jobProcess) return -1;
     QString log = m_jobProcess->readAll();
+    if (!log.isEmpty()) m_errorMessage.append(log + '\n');
     int progress;
     if (m_isFfmpegJob) {
         // Parse FFmpeg output