Merge pull request #22798 from mathesoncalum/22758-remove_instrument_…

…names FIx #22758: Allow deletion of instrument names
musescore · May 13, 2024 · 0a22551 · 0a22551
2 parents 7c10c7e + d90df45
commit 0a22551
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/engraving/dom/edit.cpp b/src/engraving/dom/edit.cpp
@@ -2400,9 +2400,21 @@ void Score::deleteItem(EngravingItem* el)
     if (!el) {
         return;
     }
-    // cannot remove generated elements
-    if (el->generated() && !(el->isBracket() || el->isBarLine() || el->isClef() || el->isMeasureNumber() || el->isKeySig())) {
-        return;
+
+    if (el->generated()) {
+        switch (el->type()) {
+        // These types can be removed, even if generated
+        case ElementType::BAR_LINE:
+        case ElementType::BRACKET:
+        case ElementType::CLEF:
+        case ElementType::INSTRUMENT_NAME:
+        case ElementType::KEYSIG:
+        case ElementType::MEASURE_NUMBER:
+            break;
+        // All other types cannot be removed if generated
+        default:
+            return;
+        }
     }
 //      LOGD("%s", el->typeName());