Merge pull request #126 from mgavioli/Fix_18934

Fix #18934
musescore · Nov 24, 2012 · 302097c · 302097c
2 parents 26fff15 + 294ffdf
commit 302097c
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -2513,8 +2513,18 @@ bool Measure::createEndBarLines()
                         }
                   else {                              // otherwise, get from staff
                         span        = staff->barLineSpan();
-                        spanFrom    = staff->barLineFrom();
-                        spanTo      = staff->barLineTo();
+                        if (span) {
+                              spanFrom    = staff->barLineFrom();
+                              spanTo      = staff->barLineTo();
+                              }
+                        // but if staff is set to no span, a multi-staff spanning bar line
+                        // has been shortened to span less staves and following staves left without bars;
+                        // set bar line span values to default
+                        else {
+                              span        = 1;
+                              spanFrom    = 0;
+                              spanTot     = (staff->lines()-1)*2;
+                              }
                         }
                   if ((staffIdx + span) > nstaves)
                         span = nstaves - staffIdx;