Merge pull request #4403 from MarcSabatella/279988-show-something

fix #279988: in preventing empty system, pick a visible staff to show
musescore · Dec 18, 2018 · 17f7a3f · 17f7a3f
2 parents 486c90c + f3c6425
commit 17f7a3f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -1293,18 +1293,22 @@ void Score::hideEmptyStaves(System* system, bool isFirstSystem)
 
             ++staffIdx;
             }
+      Staff* firstVisible = nullptr;
       if (systemIsEmpty) {
             for (Staff* staff : _staves) {
                   SysStaff* ss  = system->staff(staff->idx());
                   if (staff->showIfEmpty() && !ss->show()) {
                         ss->setShow(true);
                         systemIsEmpty = false;
                         }
+                  else if (!firstVisible && staff->show()) {
+                        firstVisible = staff;
+                        }
                   }
             }
       // don’t allow a complete empty system
       if (systemIsEmpty) {
-            Staff* staff = _staves.front();
+            Staff* staff = firstVisible ? firstVisible : _staves.front();
             SysStaff* ss = system->staff(staff->idx());
             ss->setShow(true);
             }