T: fix merge conflict (start_track_drag)
This commit is contained in:
parent
27817e0fbf
commit
97c174460a
@ -7254,11 +7254,6 @@ Editor::default_time_domain () const
|
|||||||
void
|
void
|
||||||
Editor::start_track_drag (TimeAxisView& tav, int y, Gtk::Widget& w)
|
Editor::start_track_drag (TimeAxisView& tav, int y, Gtk::Widget& w)
|
||||||
{
|
{
|
||||||
if (!_session) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
track_drag = new TrackDrag (dynamic_cast<RouteTimeAxisView*> (&tav), *_session);
|
|
||||||
track_drag = new TrackDrag (dynamic_cast<RouteTimeAxisView*> (&tav));
|
track_drag = new TrackDrag (dynamic_cast<RouteTimeAxisView*> (&tav));
|
||||||
DEBUG_TRACE (DEBUG::TrackDrag, string_compose ("start track drag with %1\n", track_drag));
|
DEBUG_TRACE (DEBUG::TrackDrag, string_compose ("start track drag with %1\n", track_drag));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user