fix #49801 Crash deleting stem slash on grace note

musescore · Mar 6, 2015 · 97e9f7a · 97e9f7a
1 parent 2b9daf6
commit 97e9f7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/libmscore/chord.cpp b/libmscore/chord.cpp
@@ -237,9 +237,8 @@ Chord::Chord(const Chord& c, bool link)
             add(new Stem(*(c._stem)));
       if (c._hook)
             add(new Hook(*(c._hook)));
-      if (c._stemSlash) {
+      if (c._stemSlash)
             add(new StemSlash(*(c._stemSlash)));
-            }
       if (c._arpeggio) {
             Arpeggio* a = new Arpeggio(*(c._arpeggio));
             add(a);
@@ -548,7 +547,6 @@ void Chord::remove(Element* e)
                   Q_ASSERT(_stemSlash);
                   if (_stemSlash->selected() && score())
                         score()->deselect(_stemSlash);
-                  delete _stemSlash;
                   _stemSlash = 0;
                   break;
             case Element::Type::CHORDLINE:
@@ -1238,9 +1236,8 @@ void Chord::layoutStem1()
             if (_stem)
                   score()->undoRemoveElement(_stem);
             if (_stemSlash)
-                  remove(_stemSlash);
+                  score()->undoRemoveElement(_stemSlash);
             }
-
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -1738,6 +1738,11 @@ void Score::deleteItem(Element* el)
             case Element::Type::GLISSANDO_SEGMENT:
                   el = static_cast<SpannerSegment*>(el)->spanner();
 
+            case Element::Type::STEM_SLASH:           // cannot delete this elements
+            case Element::Type::HOOK:
+                  qDebug("cannot remove %s\n", el->name());
+                  break;
+
             default:
                   undoRemoveElement(el);
                   break;