Cleanup capture stuff

[kdenlive] / src / mltdevicecapture.cpp

diff --git a/src/mltdevicecapture.cpp b/src/mltdevicecapture.cpp
index 3f4f97940d3f8d8389d541c23629716f2087051f..f9e647f1042492dee636a86be872aa768b1f5988 100644 (file)
--- a/src/mltdevicecapture.cpp
+++ b/src/mltdevicecapture.cpp
@@ -218,7 +218,7 @@ void MltDeviceCapture::stop()
         m_mltProducer = NULL;
     }
     // For some reason, the consumer seems to be deleted by previous stuff when in playlist mode
-    if (!isPlaylist) delete m_mltConsumer;
+    if (!isPlaylist && m_mltConsumer) delete m_mltConsumer;
     m_mltConsumer = NULL;
 }
 
@@ -282,7 +282,9 @@ void MltDeviceCapture::showAudio(Mlt::Frame& frame)
 
 bool MltDeviceCapture::slotStartPreview(const QString &producer, bool xmlFormat)
 {
-    if (m_mltConsumer == NULL) buildConsumer();
+    if (m_mltConsumer == NULL) {
+        buildConsumer();
+    }
     char *tmp = qstrdup(producer.toUtf8().constData());
     if (xmlFormat) m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", tmp);
     else m_mltProducer = new Mlt::Producer(*m_mltProfile, tmp);