From 0df8552627742c8f8457b277448f4a71ff64b670 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 28 Feb 2019 16:46:42 -0700
Subject: [PATCH] auto-return is still available if using JACK transport

---
 gtk2_ardour/ardour_ui_options.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 27aca563bb..5327e06cfa 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -295,8 +295,11 @@ ARDOUR_UI::parameter_changed (std::string p)
 		} else {
 			/* XXX we need to make sure that auto-play is off as well as insensitive */
 			ActionManager::get_action ("Transport", "ToggleAutoPlay")->set_sensitive (false);
-			ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false);
 			ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (false);
+			if (!_session->synced_to_engine()) {
+				/* JACK transport allows auto-return */
+				ActionManager::get_action ("Transport", "ToggleAutoReturn")->set_sensitive (false);
+			}
 		}
 
 	} else if (p == "sync-source") {