fix #40016: Crash when closing score

musescore · Dec 4, 2014 · a68454e · a68454e
1 parent f3071ac
commit a68454e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/libmscore/duration.cpp b/libmscore/duration.cpp
@@ -46,8 +46,6 @@ DurationElement::DurationElement(const DurationElement& e)
 
 DurationElement::~DurationElement()
       {
-      if (tuplet() && !tuplet()->elements().isEmpty() && tuplet()->elements().front() == this)
-            delete tuplet();
       }
 
 //---------------------------------------------------------

diff --git a/libmscore/segment.h b/libmscore/segment.h
@@ -88,7 +88,7 @@ class Segment : public Element {
       Segment* _prev;
 
       mutable bool empty;           // cached value
-      mutable bool _written;        // used for write()
+      mutable bool _written { false };        // used for write()
 
       Type _segmentType { Type::Invalid };
       int _tick;

diff --git a/libmscore/tuplet.cpp b/libmscore/tuplet.cpp
@@ -72,11 +72,6 @@ Tuplet::Tuplet(const Tuplet& t)
 
 Tuplet::~Tuplet()
       {
-      //
-      // delete all references
-      //
-      foreach(DurationElement* e, _elements)
-            e->setTuplet(0);
       delete _number;
       }
 

diff --git a/libmscore/tuplet.h b/libmscore/tuplet.h
@@ -91,7 +91,7 @@ class Tuplet : public DurationElement {
       void setRatio(const Fraction& r) { _ratio = r;            }
 
       const QList<DurationElement*>& elements() const { return _elements; }
-      void clear()                  { _elements.clear(); }
+      void clear()                                    { _elements.clear(); }
 
       virtual void layout();
       Text* number() const { return _number; }