fix #106146 Crash when pressing LEFT in note entry mode

musescore · Apr 15, 2016 · 3d5fdad · 3d5fdad
1 parent 6ee3e88
commit 3d5fdad
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/libmscore/input.cpp b/libmscore/input.cpp
@@ -116,18 +116,19 @@ void InputState::moveInputPos(Element* e)
             return;
 
       Segment* s;
-      if (e->isChordRest())
-            s = static_cast<ChordRest*>(e)->segment();
-      else
-            s = static_cast<Segment*>(e);
-      if (s->type() == Element::Type::SEGMENT) {
-            if (s->measure()->isMMRest()) {
-                  Measure* m = s->measure()->mmRestFirst();
-                  s = m->findSegment(Segment::Type::ChordRest, m->tick());
-                  }
-            _lastSegment = _segment;
-            _segment = s;
+      if (e->isSegment())
+            s = toSegment(e);
+      else if (e->isChordRest())
+            s = toChordRest(e)->segment();
+
+      Q_ASSERT(s);
+
+      if (s->measure()->isMMRest()) {
+            Measure* m = s->measure()->mmRestFirst();
+            s = m->findSegment(Segment::Type::ChordRest, m->tick());
             }
+      _lastSegment = _segment;
+      _segment = s;
       }
 
 //---------------------------------------------------------