summaryrefslogtreecommitdiff
path: root/muse2/muse/structure.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-01-03 17:26:09 +0000
committerFlorian Jung <flo@windfisch.org>2012-01-03 17:26:09 +0000
commit1bc4ba9dfc00b6e7511fbf4765296a2002f83315 (patch)
treedf6a0d5d9b61d64005dd368afea0aea11ab0a6b3 /muse2/muse/structure.cpp
parentb988a0a27bc175ce10bc8fa53ed131486813f3e7 (diff)
merged with release_2_0
Diffstat (limited to 'muse2/muse/structure.cpp')
-rw-r--r--muse2/muse/structure.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/muse2/muse/structure.cpp b/muse2/muse/structure.cpp
index 70b19540..d1d8d3a1 100644
--- a/muse2/muse/structure.cpp
+++ b/muse2/muse/structure.cpp
@@ -116,15 +116,12 @@ void adjustGlobalLists(Undo& operations, int startPos, int diff)
if (tick > startPos)
{
if (tick + diff < startPos ) { // these ticks should be removed
- Marker *oldMarker = new Marker();
- *oldMarker = *m;
- markerlist->remove(m);
- operations.push_back(UndoOp(UndoOp::ModifyMarker,oldMarker, 0));
+ operations.push_back(UndoOp(UndoOp::ModifyMarker, 0, m));
} else {
- Marker *oldMarker = new Marker();
- *oldMarker = *m;
- m->setTick(tick + diff);
- operations.push_back(UndoOp(UndoOp::ModifyMarker,oldMarker, m));
+ Marker *newMarker = new Marker();
+ *newMarker = *m;
+ newMarker->setTick(tick + diff);
+ operations.push_back(UndoOp(UndoOp::ModifyMarker, newMarker, m));
}
}
}