fix #274841: rewind should reposition score

musescore · Aug 18, 2018 · 92118f0 · 92118f0
1 parent e767cab
commit 92118f0
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -5265,9 +5265,17 @@ void MuseScore::cmd(QAction* a, const QString& cmd)
                   mixer->updateAll(cs->masterScore());
             }
       else if (cmd == "rewind") {
-            seq->rewindStart();
-            if (playPanel)
-                  playPanel->heartBeat(0, 0, 0);
+            if (cs) {
+                  int tick = loop() ? cs->loopInTick() : 0;
+                  seq->seek(tick);
+                  if (cv) {
+                        Measure* m = cs->tick2measureMM(tick);
+                        if (m)
+                              cv->gotoMeasure(m);
+                        }
+                  if (playPanel)
+                        playPanel->heartBeat(0, 0, 0);
+                  }
             }
       else if (cmd == "play-next-measure")
             seq->nextMeasure();