diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-07-27 18:24:32 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:23 -0500 |
| commit | 84de4246bb86fbdbe5cafcabba5761183bbf3d55 (patch) | |
| tree | 2c6f3e0614be9b4ff43b544ee14597e54ad933e1 /gtk2_ardour/editor_drag.cc | |
| parent | d5bcf90b1a20a55fd15ac54a17577011bd75a0ae (diff) | |
correct fix previous merge conflict
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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); |