fix #25311

musescore · Aug 12, 2014 · 951f901 · 951f901
1 parent e1d6c9c
commit 951f901
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -1767,7 +1767,7 @@ Element* Score::move(const QString& cmd)
             el = nextChordRest(cr);
             }
       else if (cmd == "prev-chord") {
-            if (noteEntryMode()) {
+            if (noteEntryMode() && _is.segment()) {
                   Segment* s = _is.segment()->prev1();
                   //
                   // if _is._segment is first chord/rest segment in measure

diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -2141,13 +2141,14 @@ void Score::nextInputPos(ChordRest* cr, bool doSelect)
             int track = (cr->track() / VOICES) * VOICES;
             ncr = s ? static_cast<ChordRest*>(s->element(track)) : 0;
             }
-      _is.setSegment(ncr ? ncr->segment() : 0);
-      if (doSelect)
-            select(ncr, SelectType::SINGLE, 0);
-      if (ncr)
+      if (ncr) {
+            _is.setSegment(ncr->segment());
+            if (doSelect)
+                  select(ncr, SelectType::SINGLE, 0);
             setPlayPos(ncr->tick());
-      for (MuseScoreView* v : viewer)
-            v->moveCursor();
+            for (MuseScoreView* v : viewer)
+                  v->moveCursor();
+            }
       }
 
 //---------------------------------------------------------