Explicitly close previous popup before unloading it

cbjeukendrup · Apr 29, 2024 · d18f9b3 · d18f9b3
1 parent 09200b3
commit d18f9b3
Showing 1 changed file with 11 additions and 16 deletions.
diff --git a/src/notation/qml/MuseScore/NotationScene/internal/ElementPopupLoader.qml b/src/notation/qml/MuseScore/NotationScene/internal/ElementPopupLoader.qml
@@ -58,17 +58,6 @@ Item {
             return null
         }
 
-        function loadPopup() {
-            loader.active = true
-        }
-
-        function unloadPopup() {
-            loader.sourceComponent = undefined
-            loader.active = false
-
-            Qt.callLater(container.closed)
-        }
-
         function updateContainerPosition(elementRect) {
             container.x = elementRect.x
             container.y = elementRect.y
@@ -80,18 +69,18 @@ Item {
     }
 
     function show(elementType, elementRect) {
-        prv.unloadPopup()
-        prv.loadPopup()
+        close()
 
-        var popup = loader.createPopup(prv.componentByType(elementType), elementRect)
+        var popup = loader.loadPopup(prv.componentByType(elementType), elementRect)
         popup.open()
 
         popup.opened.connect(function() {
             container.opened()
         })
 
         popup.closed.connect(function() {
-            prv.unloadPopup()
+            loader.unloadPopup()
+            container.closed()
         })
     }
 
@@ -107,8 +96,9 @@ Item {
         anchors.fill: parent
         active: false
 
-        function createPopup(comp, elementRect) {
+        function loadPopup(comp, elementRect) {
             loader.sourceComponent = comp
+            loader.active = true
             loader.item.parent = container
 
             prv.updateContainerPosition(elementRect)
@@ -126,6 +116,11 @@ Item {
 
             return loader.item
         }
+
+        function unloadPopup() {
+            loader.active = false
+            loader.sourceComponent = null
+        }
     }
 
     Component {