fix #295881: fix a crash on undoing adding an instrument in continuou…

…s view
musescore · Oct 22, 2019 · b51896e · b51896e
1 parent 696914f
commit b51896e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -1781,11 +1781,7 @@ System* Score::getNextSystem(LayoutContext& lc)
       _systems.append(system);
       if (!isVBox) {
             int nstaves = Score::nstaves();
-            for (int i = system->staves()->size(); i < nstaves; ++i)
-                  system->insertStaff(i);
-            int dn = system->staves()->size() - nstaves;
-            for (int i = 0; i < dn; ++i)
-                  system->removeStaff(system->staves()->size()-1);
+            system->adjustStavesNumber(nstaves);
             }
       return system;
       }

diff --git a/libmscore/layoutlinear.cpp b/libmscore/layoutlinear.cpp
@@ -75,15 +75,15 @@ void Score::resetSystems(bool layoutAll, LayoutContext& lc)
             System* system = new System(this);
             _systems.push_back(system);
             page->appendSystem(system);
-            for (int i = 0; i < nstaves(); ++i)
-                  system->insertStaff(i);
+            system->adjustStavesNumber(nstaves());
             }
       else {
             if (pages().isEmpty())
                   return;
             page = pages().front();
             System* system = systems().front();
             system->clear();
+            system->adjustStavesNumber(nstaves());
             }
       lc.page = page;
       }

diff --git a/libmscore/system.cpp b/libmscore/system.cpp
@@ -179,6 +179,19 @@ void System::removeStaff(int idx)
       _staves.takeAt(idx);
       }
 
+//---------------------------------------------------------
+//   adjustStavesNumber
+//---------------------------------------------------------
+
+void System::adjustStavesNumber(int nstaves)
+      {
+      for (int i = _staves.size(); i < nstaves; ++i)
+            insertStaff(i);
+      const int dn = _staves.size() - nstaves;
+      for (int i = 0; i < dn; ++i)
+            removeStaff(_staves.size() - 1);
+      }
+
 //---------------------------------------------------------
 //   layoutSystem
 ///   Layout the System

diff --git a/libmscore/system.h b/libmscore/system.h
@@ -134,6 +134,7 @@ class System final : public Element {
 
       SysStaff* insertStaff(int);
       void removeStaff(int);
+      void adjustStavesNumber(int);
 
       int y2staff(qreal y) const;
       void setInstrumentNames(bool longName, Fraction tick = {0,1});