LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #28236: Crash when you drag-drop a barline in the last measure

Browse source
This commit is contained in:
lasconic 2014-07-24 11:20:09 +02:00
parent b2101ba764
commit fa8700a847
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libmscore/undo.cpp
View file

@ -2983,7 +2983,6 @@ void Score::undoChangeBarLine(Measure* m, BarLineType barType)
Measure* measure = s->tick2measure(m->tick());
Measure* nm = m->nextMeasure();
Repeat flags = measure->repeatFlags();
Repeat nflags = nm->repeatFlags();
switch(barType) {
case BarLineType::END:
case BarLineType::NORMAL:
@ -2993,7 +2992,7 @@ void Score::undoChangeBarLine(Measure* m, BarLineType barType)
{
s->undoChangeProperty(measure, P_ID::REPEAT_FLAGS, int(flags) & ~int(Repeat::END));
if (nm)
s->undoChangeProperty(nm, P_ID::REPEAT_FLAGS, int(nflags) & ~int(Repeat::START));
s->undoChangeProperty(nm, P_ID::REPEAT_FLAGS, int(nm->repeatFlags()) & ~int(Repeat::START));
s->undoChangeEndBarLineType(measure, barType);
measure->setEndBarLineGenerated (false);
}
@ -3004,12 +3003,12 @@ void Score::undoChangeBarLine(Measure* m, BarLineType barType)
case BarLineType::END_REPEAT:
s->undoChangeProperty(measure, P_ID::REPEAT_FLAGS, int(flags | Repeat::END));
if (nm)
s->undoChangeProperty(nm, P_ID::REPEAT_FLAGS, int(nflags) & ~int(Repeat::START));
s->undoChangeProperty(nm, P_ID::REPEAT_FLAGS, int(nm->repeatFlags()) & ~int(Repeat::START));
break;
case BarLineType::END_START_REPEAT:
s->undoChangeProperty(measure, P_ID::REPEAT_FLAGS, int(flags | Repeat::END));
if (nm)
s->undoChangeProperty(nm, P_ID::REPEAT_FLAGS, int(nflags | Repeat::START));
s->undoChangeProperty(nm, P_ID::REPEAT_FLAGS, int(nm->repeatFlags() | Repeat::START));
break;
}
}