Merge pull request #3409 from lyrischesich/268713-double-start-repeat…

…-after-reload fix #268713: Start repeat barline added twice
musescore · Jan 22, 2018 · 04013b1 · 04013b1
2 parents edfc7b2 + 11001b5
commit 04013b1
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -1870,7 +1870,7 @@ void Measure::read(XmlReader& e, int staffIdx)
             else if (tag == "BarLine") {
                   BarLine* barLine = new BarLine(score());
                   barLine->setTrack(e.track());
-
+                  barLine->read(e);
                   //
                   //  StartRepeatBarLine: at rtick == 0, always BarLineType::START_REPEAT
                   //  BarLine:            in the middle of a measure, has no semantic
@@ -1895,9 +1895,8 @@ void Measure::read(XmlReader& e, int staffIdx)
                   if (barLine) {
                         segment = getSegmentR(st, t);
                         segment->add(barLine);
+                        barLine->layout();
                         }
-                  barLine->read(e);
-                  barLine->layout();
                   }
             else if (tag == "Chord") {
                   Chord* chord = new Chord(score());