Better handling of filter removal - prevent crash

mltframework · Oct 25, 2014 · 0dc318c · 0dc318c
1 parent 037e572
commit 0dc318c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/glwidget.cpp b/src/glwidget.cpp
@@ -620,8 +620,9 @@ void GLWidget::setOffsetY(int y)
 
 void GLWidget::setCurrentFilter(QmlFilter* filter, QmlMetadata* meta)
 {
-    if (QFile::exists(meta->vuiFilePath())) {
-        rootContext()->setContextProperty("filter", filter);
+    setSource(QUrl());
+    rootContext()->setContextProperty("filter", filter);
+    if (meta && QFile::exists(meta->vuiFilePath())) {
         setSource(QUrl::fromLocalFile(meta->vuiFilePath()));
     }
 }

diff --git a/src/qml/views/filter/filterview.qml b/src/qml/views/filter/filterview.qml
@@ -63,6 +63,7 @@ Rectangle {
             Layout.fillWidth: true
             Layout.fillHeight: true
             onSelectedIndexChanged: {
+                filterConfig.source = ""
                 root.currentFilterRequested(selectedIndex)
                 filterConfig.source = metadata ? metadata.qmlFilePath : ""
             }
@@ -83,7 +84,7 @@ Rectangle {
             opacity: enabled ? 1.0 : 0.5
             tooltip: qsTr('Remove Selected Filter')
             onClicked: {
-                console.log("Remove Filter Requested", attachedFilters.selectedIndex) 
+                filterConfig.source = ""
                 root.removeFilterRequested(attachedFilters.selectedIndex)
             }
         }