From 97c174460aeaec77a3d16a3683d9d9e70cddcd72 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Wed, 29 May 2024 16:15:32 +0200
Subject: [PATCH] T: fix merge conflict (start_track_drag)

---
 gtk2_ardour/editor.cc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index a6ca1f768f..5427aa8d92 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -7254,11 +7254,6 @@ Editor::default_time_domain () const
 void
 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));
 	DEBUG_TRACE (DEBUG::TrackDrag, string_compose ("start track drag with %1\n", track_drag));