fix #25136: Opening a score with minimum empty measure for mmRest = 0…

… causes hang
musescore · Mar 26, 2014 · 2c8a2d6 · 2c8a2d6
1 parent ef3a7da
commit 2c8a2d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/libmscore/read114.cpp b/libmscore/read114.cpp
@@ -625,6 +625,8 @@ Score::FileError Score::read114(XmlReader& e)
             style()->set(ST_evenFooterL, QString("$P"));
             style()->set(ST_oddFooterR, QString("$P"));
             }
+      if (style(ST_minEmptyMeasures).toInt() == 0)
+            style()->set(ST_minEmptyMeasures, 1);
 
       _showOmr = false;
 

diff --git a/mscore/editstyle.ui b/mscore/editstyle.ui
@@ -286,7 +286,14 @@
                 </widget>
                </item>
                <item row="1" column="1">
-                <widget class="QSpinBox" name="minEmptyMeasures"/>
+                <widget class="QSpinBox" name="minEmptyMeasures">
+                 <property name="minimum">
+                  <number>1</number>
+                 </property>
+                 <property name="value">
+                  <number>2</number>
+                 </property>
+                </widget>
                </item>
               </layout>
              </item>