implement MarkerDrag::abort()

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index f34b94e98905e9735ff2dc2ee03dc9f14adeec6a..7ac8f9c16ac0c29eaa12321c0cd28268b5a1b72d 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3540,9 +3540,20 @@ MarkerDrag::finished (GdkEvent* event, bool movement_occurred)
 }
 
 void
-MarkerDrag::aborted (bool)
+MarkerDrag::aborted (bool movement_occured)
 {
-       /* XXX: TODO */
+       if (!movement_occured) {
+               return;
+       }
+
+       for (CopiedLocationInfo::iterator x = _copied_locations.begin(); x != _copied_locations.end(); ++x) {
+
+               /* move all markers to their original location */
+               
+               for (vector<Marker*>::iterator m = x->markers.begin(); m != x->markers.end(); ++m) {
+                       (*m)->set_position ((*m)->location()->start(), (*m)->location()->end());
+               }
+       }
 }
 
 void