correct fix previous merge conflict

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 59e50836e4fc225f22f6d4eb86a9c1da49b0c1d4..f7ee904308ea09be26f5ae105075261deafbff51 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3763,7 +3763,7 @@ MarkerDrag::MarkerDrag (Editor* e, ArdourCanvas::Item* i)
 {
        DEBUG_TRACE (DEBUG::Drags, "New MarkerDrag\n");
        Gtk::Window* toplevel = _editor->current_toplevel();
-       _marker = reinterpret_cast<Marker*> (_item->get_data ("marker"));
+       _marker = reinterpret_cast<ArdourMarker*> (_item->get_data ("marker"));
 
        assert (_marker);