fix #287747: bad drawing of selection with disabled segment

musescore · Apr 15, 2019 · 6eb7079 · 6eb7079
1 parent 25c8a3e
commit 6eb7079
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -1206,6 +1206,13 @@ void ScoreView::paint(const QRect& r, QPainter& p)
             if (!ss)
                   return;
 
+            if (!ss->enabled())
+                  ss = ss->next1MMenabled();
+            if (es && !es->enabled())
+                  es = es->prev1MMenabled();
+            if (es && ss->tick() > es->tick())  // start after end?
+                  return;
+
             if (!ss->measure()->system()) {
                   // segment is in a measure that has not been laid out yet
                   // this can happen in mmrests
@@ -1258,7 +1265,7 @@ void ScoreView::paint(const QRect& r, QPainter& p)
             double x1;
 
             for (Segment* s = ss; s && (s != es); ) {
-                  Segment* ns = s->next1MM();
+                  Segment* ns = s->next1MMenabled();
                   system1  = system2;
                   system2  = s->measure()->system();
                   if (!system2) {