Fix #251 crash changing clip properties on Timeline.

mltframework · Jun 6, 2016 · c28756a · c28756a
1 parent 01bfca3
commit c28756a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/docks/timelinedock.cpp b/src/docks/timelinedock.cpp
@@ -413,6 +413,7 @@ void TimelineDock::onProducerChanged(Mlt::Producer* after)
                                   qMin(qRound(info->frame_out * speedRatio), length - 1));
             QString xmlAfter = MLT.XML(after);
             m_updateCommand->setXmlAfter(xmlAfter);
+            setSelection(); // clearing selection prevents a crash
             Timeline::UpdateCommand* command = m_updateCommand;
             m_updateCommand = 0;
             MAIN.undoStack()->push(command);

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -2265,10 +2265,12 @@ QWidget *MainWindow::loadProducerWidget(Mlt::Producer* producer)
 {
     QWidget* w = 0;
     QScrollArea* scrollArea = (QScrollArea*) m_propertiesDock->widget();
-    delete scrollArea->widget();
 
-    if (!producer || !producer->is_valid())
+    if (!producer || !producer->is_valid()) {
+        if (scrollArea->widget())
+            scrollArea->widget()->deleteLater();
         return  w;
+    }
 
     QString service(producer->get("mlt_service"));
     QString resource = QString::fromUtf8(producer->get("resource"));
@@ -2338,6 +2340,8 @@ QWidget *MainWindow::loadProducerWidget(Mlt::Producer* producer)
         }
         scrollArea->setWidget(w);
         onProducerChanged();
+    } else if (scrollArea->widget()) {
+        scrollArea->widget()->deleteLater();
     }
     return w;
 }