Skip to content

Commit a68454e

Browse files
committed
fix #40016: Crash when closing score
1 parent f3071ac commit a68454e

File tree

4 files changed

+2
-9
lines changed

4 files changed

+2
-9
lines changed

libmscore/duration.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ DurationElement::DurationElement(const DurationElement& e)
4646

4747
DurationElement::~DurationElement()
4848
{
49-
if (tuplet() && !tuplet()->elements().isEmpty() && tuplet()->elements().front() == this)
50-
delete tuplet();
5149
}
5250

5351
//---------------------------------------------------------

libmscore/segment.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class Segment : public Element {
8888
Segment* _prev;
8989

9090
mutable bool empty; // cached value
91-
mutable bool _written; // used for write()
91+
mutable bool _written { false }; // used for write()
9292

9393
Type _segmentType { Type::Invalid };
9494
int _tick;

libmscore/tuplet.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ Tuplet::Tuplet(const Tuplet& t)
7272

7373
Tuplet::~Tuplet()
7474
{
75-
//
76-
// delete all references
77-
//
78-
foreach(DurationElement* e, _elements)
79-
e->setTuplet(0);
8075
delete _number;
8176
}
8277

libmscore/tuplet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class Tuplet : public DurationElement {
9191
void setRatio(const Fraction& r) { _ratio = r; }
9292

9393
const QList<DurationElement*>& elements() const { return _elements; }
94-
void clear() { _elements.clear(); }
94+
void clear() { _elements.clear(); }
9595

9696
virtual void layout();
9797
Text* number() const { return _number; }

0 commit comments

Comments
 (0)