From 2137672fde40c5d76cdf3a28d8317fe346c307f9 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 21 May 2024 07:26:09 -0600
Subject: [PATCH] L: always reassign track numbers when adding tracks

While presentation info order information is restored from XML state,
track numbers are not, so make sure we setup track numbering during
loading (based on PI order info)
---
 libs/ardour/session.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 6bfe155edc..fa10baf38e 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -3681,11 +3681,12 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
 					r->enable_direct_outs ();
 				}
 			}
-			/* do not take `_auto_connect_queue_lock' while holding the process lock */
-			lm.release ();
-			reassign_track_numbers ();
 		}
 	}
+
+#ifdef LIVETRAX
+	reassign_track_numbers ();
+#endif
 }
 
 void
@@ -4664,7 +4665,7 @@ Session::reassign_track_numbers ()
 		}
 	}
 
-	if (Profile->get_livetrax()) {
+	if (!loading() && Profile->get_livetrax()) {
 		livetrax_queue_auto_connect ();
 	}