fix #308860: crash on adding breath or rest to palette

musescore · Aug 18, 2020 · ac59684 · ac59684
1 parent bd675e7
commit ac59684
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libmscore/breath.cpp b/libmscore/breath.cpp
@@ -63,7 +63,7 @@ bool Breath::isCaesura() const
 
 void Breath::layout()
       {
-      bool palette = (track() == -1);
+      bool palette = (!staff() || track() == -1);
       if (!palette) {
             int voiceOffset = placeBelow() * (staff()->lines(tick()) - 1) * spatium();
             if (isCaesura())

diff --git a/libmscore/rest.cpp b/libmscore/rest.cpp
@@ -429,7 +429,7 @@ void Rest::layout()
 
       qreal yOff       = offset().y();
       const Staff* stf = staff();
-      const StaffType*  st = stf->staffTypeForElement(this);
+      const StaffType*  st = stf ? stf->staffTypeForElement(this) : 0;
       qreal lineDist = st ? st->lineDistance().val() : 1.0;
       int userLine   = yOff == 0.0 ? 0 : lrint(yOff / (lineDist * _spatium));
       int lines      = st ? st->lines() : 5;
@@ -786,7 +786,7 @@ void Rest::reset()
 
 qreal Rest::mag() const
       {
-      qreal m = staff()->mag(this);
+      qreal m = staff() ? staff()->mag(this) : 1.0;
       if (small())
             m *= score()->styleD(Sid::smallNoteMag);
       return m;