Merge pull request #4651 from jthistle/282507-imported-framegap-lost-…

…on-save fix #282507: imported frame gap of 0 lost on save
musescore · Mar 8, 2019 · 5749fe8 · 5749fe8
1 parent aaed7ce
commit 5749fe8
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/libmscore/read206.cpp b/libmscore/read206.cpp
@@ -3360,6 +3360,8 @@ static void readBox(Box* b, XmlReader& e)
       b->setBottomMargin(0.0);
       b->setTopGap(0.0);
       b->setBottomGap(0.0);
+      b->setPropertyFlags(Pid::TOP_GAP, PropertyFlags::UNSTYLED);
+      b->setPropertyFlags(Pid::BOTTOM_GAP, PropertyFlags::UNSTYLED);
 
       b->setBoxHeight(Spatium(0));     // override default set in constructor
       b->setBoxWidth(Spatium(0));
@@ -3467,9 +3469,17 @@ static void readStaffContent(Score* score, XmlReader& e)
                         readBox(b, e);
                         b->setTick(e.tick());
                         score->measures()->add(b);
-                        lastReadBox = b;
-                        if (readMeasureLast)
+
+                        // If it's the first box, and comes before any measures, reset to
+                        // 301 default.
+                        if (!readMeasureLast && !lastReadBox) {
+                              b->setTopGap(b->propertyDefault(Pid::TOP_GAP).toReal());
+                              b->setPropertyFlags(Pid::TOP_GAP, PropertyFlags::STYLED);
+                              }
+                        else if (readMeasureLast)
                               b->setTopGap(b->topGap() + b->propertyDefault(Pid::TOP_GAP).toReal());
+
+                        lastReadBox = b;
                         readMeasureLast = false;
                         }
                   else if (tag == "tick")