From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 27 Jul 2015 22:24:32 +0000 (-0400)
Subject: correct fix previous merge conflict
X-Git-Tag: 5.0-pre0~1574
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=84de4246bb86fbdbe5cafcabba5761183bbf3d55;p=ardour.git

correct fix previous merge conflict
---

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 59e50836e4..f7ee904308 100644
--- 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);