Skip to content

Commit

Permalink
fix #51761 Slurs & lines disappear or move in the non-rewritten measu…
Browse files Browse the repository at this point in the history
…res on add of time signature
  • Loading branch information
wschweer committed Apr 14, 2015
1 parent df48278 commit 83c0ac7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
4 changes: 3 additions & 1 deletion libmscore/edit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,8 @@ bool Score::rewriteMeasures(Measure* fm, Measure* lm, const Fraction& ns, int st
nlm->setNext(m2->next());
s->undo(new InsertMeasures(nfm, nlm));
}
if (!fill.isZero())
undoInsertTime(lm->endTick(), fill.ticks());

if (!range.write(rootScore(), fm->tick()))
qFatal("Cannot write measures");
Expand Down Expand Up @@ -2769,7 +2771,7 @@ void Score::checkSpanner(int startTick, int endTick)
if (s->type() == Element::Type::SLUR) {
Segment* seg = tick2segmentMM(s->tick(), false, Segment::Type::ChordRest);
if (!seg || !seg->element(s->track())) {
qDebug("checkSpanner::remove (1)");
qDebug("checkSpanner::remove (1) tick %d seg %p", s->tick(), seg);
sl.append(s);
}
else {
Expand Down
15 changes: 0 additions & 15 deletions libmscore/undo.h
Original file line number Diff line number Diff line change
Expand Up @@ -455,21 +455,6 @@ class ChangeSingleBarLineSpan : public UndoCommand {
UNDO_NAME("ChangeSingleBarLineSpan")
};

//---------------------------------------------------------
// SigInsertTime
//---------------------------------------------------------

class SigInsertTime : public UndoCommand {
Score* score;
int tick;
int len;
void flip();

public:
SigInsertTime(Score*, int tick, int len);
UNDO_NAME("SigInsertTime")
};

//---------------------------------------------------------
// TransposeHarmony
//---------------------------------------------------------
Expand Down

0 comments on commit 83c0ac7

Please sign in to comment.