Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #296566: erase invalid elements from CmdState #5460

Closed
wants to merge 1 commit into from
Closed

fix #296566: erase invalid elements from CmdState #5460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions libmscore/cmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,16 @@ void CmdState::setElement(const Element* e)
_elIsMeasureBase = newIsMeasureBase;
}

//---------------------------------------------------------
// unsetElement
//---------------------------------------------------------

void CmdState::unsetElement(const Element* e)
{
if (_el == e)
_el = nullptr;
}

//---------------------------------------------------------
// setUpdateMode
//---------------------------------------------------------
Expand Down
4 changes: 3 additions & 1 deletion libmscore/score.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,8 @@ Score::Score(MasterScore* parent, const MStyle& s)

Score::~Score()
{
Score::validScores.erase(this);

foreach(MuseScoreView* v, viewer)
v->removeScore();
// deselectAll();
Expand All @@ -335,7 +337,6 @@ Score::~Score()

qDeleteAll(_parts);
qDeleteAll(_staves);
Score::validScores.erase(this);
// qDeleteAll(_pages); // TODO: check
_masterScore = 0;

Expand Down Expand Up @@ -384,6 +385,7 @@ void Score::onElementDestruction(Element* e)
return;
}
score->selection().remove(e);
score->cmdState().unsetElement(e);
for (MuseScoreView* v : score->viewer)
v->onElementDestruction(e);
}
Expand Down
1 change: 1 addition & 0 deletions libmscore/score.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ class CmdState {
void setTick(const Fraction& t);
void setStaff(int staff);
void setElement(const Element* e);
void unsetElement(const Element* e);
Fraction startTick() const { return _startTick; }
Fraction endTick() const { return _endTick; }
int startStaff() const { return _startStaff; }
Expand Down
12 changes: 12 additions & 0 deletions mtest/testscript/scripts/296566-add-glissando-note-rest-crash.script
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
init init/Treble.mscx
cmd note-input
cmd note-a
cmd escape
# Crashed at the following line.
# A potential crash happens only if ScoreView gets created
# (or something else uses CmdState's element field).
palette Glissando subtype 0
cmd undo
cmd undo
cmd escape
test score init/Treble.mscx