Stopmotion widget: Improved webcam support, taken from the fswebcam project

[kdenlive] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 1dfe6e491841317e3c664b8bc591f72cb25b0394..d578f11907dcf62e31329358bcc60ecb373317f4 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -553,6 +553,9 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString &
 
 MainWindow::~MainWindow()
 {
+    if (m_stopmotion) {
+        delete m_stopmotion;
+    }
     m_effectStack->slotClipItemSelected(NULL, 0);
     m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false);
 
@@ -2508,6 +2511,7 @@ void MainWindow::slotPreferences(int page, int option)
      * cached, in which case you want to display the cached dialog
      * instead of creating another one
      */
+    if (m_stopmotion) m_stopmotion->slotLive(false);
     if (KConfigDialog::showDialog("settings")) {
         KdenliveSettingsDialog* d = static_cast <KdenliveSettingsDialog*>(KConfigDialog::exists("settings"));
         if (page != -1) d->showPage(page, option);
@@ -4015,7 +4019,6 @@ void MainWindow::slotOpenStopmotion()
     m_stopmotion->show();
 }
 
-
 void MainWindow::slotDeleteClip(const QString &id)
 {
     QList <ClipProperties *> list = findChildren<ClipProperties *>();