fix #269378 Double Coda leads to not detecting 'final' playthrough af…

…ter 2nd jump rewind logic
musescore · Feb 16, 2018 · 1d3a9d3 · 1d3a9d3
1 parent 40c97ee
commit 1d3a9d3
Show file tree

Hide file tree

Showing 3 changed files with 774 additions and 2 deletions.
diff --git a/libmscore/repeatlist.cpp b/libmscore/repeatlist.cpp
@@ -440,8 +440,10 @@ void RepeatList::unwindSection(Measure* sectionStartMeasure, Measure* sectionEnd
                                           for (Measure* m = _score->firstMeasure(); m; m = m->nextMeasure())
                                                 m->setPlaybackCount(0);
                                           }
-                                    else { // set each measure to have it play it's final time, but only from our jumptarget on until the current measure
-                                          for (Measure* m = jumpToMeasure; (m && (m != currentMeasure->nextMeasure())); m = m->nextMeasure()) {
+                                    else { // set each measure to have it play its final time
+                                          // but only from our jumptarget on until the playUntil/current measure (whichever comes first)
+                                          Measure* const rewindUntil = (playUntilMeasure->no() < currentMeasure->no()) ? playUntilMeasure->nextMeasure() : currentMeasure->nextMeasure();
+                                          for (Measure* m = jumpToMeasure; (m && (m != rewindUntil)); m = m->nextMeasure()) {
                                                 if (m->playbackCount() != 0)
                                                       m->setPlaybackCount(m->playbackCount() - 1);
                                                 }