Merge pull request #21141 from RomanPudashkin/no_beam_crash

no_beam_crash
musescore · Jan 22, 2024 · c22d8a0 · c22d8a0
2 parents 4b72a4d + 56ca0f5
commit c22d8a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/engraving/dom/score.cpp b/src/engraving/dom/score.cpp
@@ -1734,7 +1734,8 @@ void Score::doUndoRemoveElement(EngravingItem* element)
 {
     if (element->generated()) {
         removeElement(element);
-        element->deleteLater();
+        //! HACK: don't delete as it may still be used in Inspector
+        // element->deleteLater();
     } else {
         undo(new RemoveElement(element));
     }

diff --git a/src/inspector/models/notation/notes/beams/beamsettingsmodel.cpp b/src/inspector/models/notation/notes/beams/beamsettingsmodel.cpp
@@ -96,11 +96,9 @@ void BeamSettingsModel::loadProperties()
     loadProperties(propertyIdSet);
 }
 
-void BeamSettingsModel::onNotationChanged(const PropertyIdSet&, const StyleIdSet&)
+void BeamSettingsModel::onNotationChanged(const PropertyIdSet& changedPropertyIdSet, const StyleIdSet&)
 {
-    // The list of elements may have become invalid; beams might have been deleted and replaced during layout.
-    // Request the actual list to prevent crashes. TODO: Not ideal for performance though.
-    updateProperties();
+    loadProperties(changedPropertyIdSet);
 }
 
 void BeamSettingsModel::loadProperties(const mu::engraving::PropertyIdSet& propertyIdSet)