From e67c925b1f396b1e68d4997a492330a3e222dc17 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Tue, 9 Feb 2021 22:46:05 +0100
Subject: [PATCH] Auto-connect thread: only take process-lock if needed

---
 libs/ardour/session.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index b8ae15c39b..3036c57223 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -7147,11 +7147,11 @@ Session::auto_connect_thread_run ()
 			}
 		}
 
-		{
+		if (_engine.port_deletions_pending ().read_space () > 0) {
 			// this may call ARDOUR::Port::drop ... jack_port_unregister ()
 			// jack1 cannot cope with removing ports while processing
 			Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
-			AudioEngine::instance()->clear_pending_port_deletions ();
+			_engine.clear_pending_port_deletions ();
 		}
 
 		lx.acquire ();