From: Jean-Baptiste M. <jb...@kd...> - 2012-12-31 13:42:30
|
Git commit 1a07028e9a62877adcb784cb432ed0e01862f371 by Jean-Baptiste Mardelle. Committed on 31/12/2012 at 14:42. Pushed by mardelle into branch 'master'. Fix capture with libav M +4 -3 src/recmonitor.cpp http://commits.kde.org/kdenlive/1a07028e9a62877adcb784cb432ed0e01862f371 diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index 27ca6c2..3c9f3ce 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -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))); } |