fix regression with dots

musescore · May 29, 2013 · f48ed4a · f48ed4a
1 parent bf194db
commit f48ed4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libmscore/articulation.h b/libmscore/articulation.h
@@ -71,7 +71,7 @@ class Articulation : public Element {
       virtual Articulation* clone() const   { return new Articulation(*this); }
       virtual ElementType type() const      { return ARTICULATION; }
 
-      virtual qreal mag() const             { return parent()->mag(); }
+      virtual qreal mag() const             { return parent() ? parent()->mag(): 1.0; }
 
       void setArticulationType(ArticulationType);
       ArticulationType articulationType() const { return _articulationType; }

diff --git a/libmscore/chord.cpp b/libmscore/chord.cpp
@@ -1910,7 +1910,7 @@ Element* Chord::drop(const DropData& data)
 
 qreal Chord::dotPosX() const
       {
-      if(staffIdx())
+      if (parent())
             return segment()->dotPosX(staffIdx());
       return -1000.0;
       }
@@ -1921,7 +1921,7 @@ qreal Chord::dotPosX() const
 
 void Chord::setDotPosX(qreal val)
       {
-      if (staffIdx())
+      if (parent())
             segment()->setDotPosX(staffIdx(), val);
       }