]> git.sesse.net Git - kdenlive/commitdiff
Fix capture with libav
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 31 Dec 2012 13:42:01 +0000 (14:42 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 31 Dec 2012 13:42:01 +0000 (14:42 +0100)
src/recmonitor.cpp

index 27ca6c2d9f975d019a7b1ad67c2f73db341d06ef..3c9f3cea7dd1a105dc88fc25823ff3f254acf6cf 100644 (file)
@@ -402,7 +402,7 @@ void RecMonitor::slotStopCapture()
         break;
     case SCREENGRAB:
         m_captureProcess->write("q\n", 3);
-        //m_captureProcess->terminate();
+        m_captureProcess->terminate();
         //video_frame->setText(i18n("Encoding captured video..."));
         QTimer::singleShot(1000, m_captureProcess, SLOT(kill()));
         break;
@@ -846,8 +846,9 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status)
             if (device_selector->currentIndex() != SCREENGRAB) {
                 video_frame->setText(i18n("Not connected"));
             } else {
-                if (m_captureProcess->exitCode() != 0) {
-                    video_frame->setText(i18n("Capture crashed, please check your parameters\nRecordMyDesktop exit code: %1", QString::number(m_captureProcess->exitCode())));
+               int code = m_captureProcess->exitCode();
+                if (code != 0 && code != 255) {
+                    video_frame->setText(i18n("Capture crashed, please check your parameters.\nExit code: %1", QString::number(m_captureProcess->exitCode())));
                 } else {
                     video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", m_capturePath)));
                 }