fix #28936

musescore · Aug 5, 2014 · 2f8b654 · 2f8b654
1 parent 5373c93
commit 2f8b654
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -2473,7 +2473,7 @@ bool Measure::createEndBarLines()
             // and forget about any previous bar line
 
             if (span == 0) {
-                  if(cbl && cbl->customSpan()) {      // if there is a bar line and has custom span,
+                  if (cbl && cbl->customSpan()) {      // if there is a bar line and has custom span,
                         span        = cbl->span();    // get span values from it
                         spanFrom    = cbl->spanFrom();
                         spanTo      = cbl->spanTo();

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -2467,9 +2467,9 @@ void Score::cmdRemoveStaff(int staffIdx)
       // remove linked staff and measures in linked staves in excerps
       // should be done earlier for the main staff
       if (s->linkedStaves()) {
-            for(Staff* staff : s->linkedStaves()->staves()) {
+            for (Staff* staff : s->linkedStaves()->staves()) {
                  Score* lscore = staff->score();
-                 if(lscore != this) {
+                 if (lscore != this) {
                        int lstaffIdx = lscore->staffIdx(staff);
                        int pIndex = lscore->staffIdx(staff->part());
                        //adjustBracketsDel(lstaffIdx, lstaffIdx+1);

diff --git a/libmscore/staff.cpp b/libmscore/staff.cpp
@@ -924,5 +924,14 @@ QList<Staff*> Staff::staffList() const
       return staffList;
       }
 
+//---------------------------------------------------------
+//   setBarLineTo
+//---------------------------------------------------------
+
+void Staff::setBarLineTo(int val)
+      {
+      _barLineTo = val;
+      }
+
 }
 
diff --git a/libmscore/staff.h b/libmscore/staff.h
@@ -184,7 +184,7 @@ class Staff : public QObject {
       int barLineTo() const          { return _barLineTo;   }
       void setBarLineSpan(int val)   { _barLineSpan = val;  }
       void setBarLineFrom(int val)   { _barLineFrom = val;  }
-      void setBarLineTo(int val)     { _barLineTo   = val;  }
+      void setBarLineTo(int val);
       Score* score() const           { return _score;       }
       qreal mag() const;
       qreal height() const;

diff --git a/mscore/instrdialog.cpp b/mscore/instrdialog.cpp
@@ -1259,7 +1259,7 @@ void MuseScore::editInstrList()
       for (int i = 0; i < n; ++i) {
             Staff* staff = rootScore->staff(i);
             if (staff->barLineSpan() > (n - i))
-                  rootScore->undoChangeBarLineSpan(staff, n - i, 0, rootScore->staff(n-1)->lines()-1);
+                  rootScore->undoChangeBarLineSpan(staff, n - i, 0, (rootScore->staff(n-1)->lines()-1) * 2);
             QList<BracketItem> brackets = staff->brackets();
             int nn = brackets.size();
             for (int ii = 0; ii < nn; ++ii) {