implement MarkerDrag::abort()

1 files changed, 13 insertions, 2 deletions

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index f34b94e989..7ac8f9c16a 100644
--- 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