Merge pull request #1659 from MarcSabatella/44851-crash-after-delete

MarcSabatella · MarcSabatella · commit 451668532a74 · 2015-01-19T19:47:42.000-07:00
fix #44851: crash on navigate after delete
diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -1511,8 +1511,11 @@ void Score::deleteItem(Element* el)
                   Rest* rest = static_cast<Rest*>(el);
                   if (rest->tuplet() && rest->tuplet()->elements().empty())
                         undoRemoveElement(rest->tuplet());
-                  if (el->voice() != 0)
+                  if (el->voice() != 0) {
                         undoRemoveElement(el);
+                        if (noteEntryMode())
+                              _is.moveToNextInputPos();
+                        }
                   }
                   break;
 
diff --git a/libmscore/select.cpp b/libmscore/select.cpp
@@ -146,6 +146,8 @@ Element* Selection::element() const
 ChordRest* Selection::cr() const
       {
       Element* e = element();
+      if (!e)
+            return 0;
       if (e->type() == Element::Type::NOTE)
             e = e->parent();
       if (e->isChordRest())

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,8 @@ Element* Selection::element() const`
`146`	`146`	`ChordRest* Selection::cr() const`
`147`	`147`	`{`
`148`	`148`	`Element* e = element();`
	`149`	`+ if (!e)`
	`150`	`+ return 0;`
`149`	`151`	`if (e->type() == Element::Type::NOTE)`
`150`	`152`	`e = e->parent();`
`151`	`153`	`if (e->isChordRest())`