Merge pull request #10015 from Eism/qml_warnings_fix

[MU4] Fixed qml warnings caused by closing notation
musescore · Dec 8, 2021 · d9edfd5 · d9edfd5
2 parents 2dab0fd + e0a3da2
commit d9edfd5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/instrumentsscene/qml/MuseScore/InstrumentsScene/InstrumentsPanel.qml b/src/instrumentsscene/qml/MuseScore/InstrumentsScene/InstrumentsPanel.qml
@@ -221,7 +221,7 @@ Item {
                         property bool isSelected: false
 
                         function updateIsSelected() {
-                            treeItemDelegateLoader.isSelected = instrumentsTreeModel.isSelected(styleData.index)
+                            treeItemDelegateLoader.isSelected = (Boolean(styleData.index.row) && instrumentsTreeModel.isSelected(styleData.index))
                         }
 
                         Connections {

diff --git a/src/notation/qml/MuseScore/NotationScene/internal/NotationSwitchPanel.qml b/src/notation/qml/MuseScore/NotationScene/internal/NotationSwitchPanel.qml
@@ -80,19 +80,19 @@ Rectangle {
         delegate: NotationSwitchButton {
             id: button
 
-            navigation.name: "NotationTab" + model.index
+            navigation.name: "NotationTab" + index
             navigation.panel: navPanel
             navigation.row: 1
-            navigation.column: model.index + 1
+            navigation.column: index + 1
 
             text: model.title
             needSave: model.needSave
 
             ButtonGroup.group: notationsView.radioButtonGroup
-            checked: model.index === notationsView.currentIndex
+            checked: index === notationsView.currentIndex
 
             function resolveNextNotationIndex() {
-                var nextIndex = model.index - 1
+                var nextIndex = index - 1
                 if (nextIndex < 0) {
                     return 0
                 }
@@ -101,18 +101,18 @@ Rectangle {
             }
 
             onToggled: {
-                notationSwitchModel.setCurrentNotation(model.index)
+                notationSwitchModel.setCurrentNotation(index)
             }
 
             onCloseRequested: {
-                if (model.index !== notationsView.currentIndex) {
-                    notationSwitchModel.closeNotation(model.index)
+                if (index !== notationsView.currentIndex) {
+                    notationSwitchModel.closeNotation(index)
                     return
                 }
 
-                var index = button.resolveNextNotationIndex()
-                notationSwitchModel.closeNotation(model.index)
-                notationSwitchModel.setCurrentNotation(index)
+                var nextIndex = button.resolveNextNotationIndex()
+                notationSwitchModel.setCurrentNotation(nextIndex)
+                notationSwitchModel.closeNotation(index)
             }
         }
     }