Merge pull request musescore#23993 from mike-spa/fixCrashOnUndoMeasur…

…eDelete The selection state should be updated in all scores when something changes
igorkorsukov · Aug 12, 2024 · eea8fbc · eea8fbc
2 parents 9784899 + 370574d
commit eea8fbc
Showing 1 changed file with 24 additions and 23 deletions.
diff --git a/src/engraving/dom/cmd.cpp b/src/engraving/dom/cmd.cpp
@@ -497,34 +497,35 @@ void Score::update(bool resetCmdState, bool layoutAllParts)
         m_needSetUpTempoMap = false;
     }
 
-    {
-        MasterScore* ms = masterScore();
-        CmdState& cs = ms->cmdState();
-        if (updateAll || cs.updateAll()) {
-            for (Score* s : scoreList()) {
-                for (MuseScoreView* v : s->m_viewer) {
-                    v->updateAll();
-                }
-            }
-        } else if (cs.updateRange()) {
-            // updateRange updates only current score
-            double d = style().spatium() * .5;
-            m_updateState.refresh.adjust(-d, -d, 2 * d, 2 * d);
-            for (MuseScoreView* v : m_viewer) {
-                v->dataChanged(m_updateState.refresh);
+    MasterScore* ms = masterScore();
+    CmdState& cs = ms->cmdState();
+    if (updateAll || cs.updateAll()) {
+        for (Score* s : scoreList()) {
+            for (MuseScoreView* v : s->m_viewer) {
+                v->updateAll();
             }
-            m_updateState.refresh = RectF();
         }
-        if (playlistDirty()) {
-            masterScore()->setPlaylistClean();
-        }
-        if (resetCmdState) {
-            cs.reset();
+    } else if (cs.updateRange()) {
+        // updateRange updates only current score
+        double d = style().spatium() * .5;
+        m_updateState.refresh.adjust(-d, -d, 2 * d, 2 * d);
+        for (MuseScoreView* v : m_viewer) {
+            v->dataChanged(m_updateState.refresh);
         }
+        m_updateState.refresh = RectF();
+    }
+    if (playlistDirty()) {
+        masterScore()->setPlaylistClean();
+    }
+    if (resetCmdState) {
+        cs.reset();
     }
 
-    if (m_selection.isRange() && !m_selection.isLocked()) {
-        m_selection.updateSelectedElements();
+    for (Score* score : ms->scoreList()) {
+        Selection& sel = score->selection();
+        if (sel.isRange() && !sel.isLocked()) {
+            sel.updateSelectedElements();
+        }
     }
 }