summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2013-09-12 18:51:16 +0200
committerFlorian Jung <flo@windfisch.org>2013-09-12 18:51:16 +0200
commit77411cc3079994d19b920af15d0b858bb66e19fe (patch)
tree2ff514db90ad7248cafa2effacca1a4b92d17c28
parent4ad75075044fc08864f0666e59b6428b50caf4c5 (diff)
minor fixes
-rw-r--r--muse2/muse/seqmsg.cpp6
-rw-r--r--muse2/muse/widgets/utils.cpp2
2 files changed, 3 insertions, 5 deletions
diff --git a/muse2/muse/seqmsg.cpp b/muse2/muse/seqmsg.cpp
index 3dca4d44..669aff9d 100644
--- a/muse2/muse/seqmsg.cpp
+++ b/muse2/muse/seqmsg.cpp
@@ -669,7 +669,7 @@ void Audio::msgPlay(bool val)
void Audio::msgRemoveTrack(Track* track, bool doUndoFlag)
{
- MusEGlobal::song->applyOperation(UndoOp(UndoOp::DeleteTrack, MusEGlobal::song->tracks()->index(track), track));
+ MusEGlobal::song->applyOperation(UndoOp(UndoOp::DeleteTrack, MusEGlobal::song->tracks()->index(track), track), doUndoFlag);
}
//---------------------------------------------------------
@@ -689,9 +689,7 @@ void Audio::msgRemoveTracks()
Track* tr = *t;
if (tr->selected())
{
- MusEGlobal::song->removeTrack1(tr);
- msgRemoveTrack(tr, false);
- MusEGlobal::song->removeTrack3(tr);
+ MusEGlobal::song->applyOperation(UndoOp(UndoOp::DeleteTrack, MusEGlobal::song->tracks()->index(tr), tr), false);
loop = true;
break;
}
diff --git a/muse2/muse/widgets/utils.cpp b/muse2/muse/widgets/utils.cpp
index 0cb10a20..687c76e4 100644
--- a/muse2/muse/widgets/utils.cpp
+++ b/muse2/muse/widgets/utils.cpp
@@ -542,7 +542,7 @@ int get_paste_len()
if (p->endTick() > end_tick)
end_tick=p->endTick();
- p->unchainClone();
+ p->unchainClone(); // just for safety; shouldn't be chained anyway.
delete p;
}
}