From d574b6ff364b5c17ac59a7ff92ef450b3e6fe4fa Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sat, 14 Dec 2019 10:36:31 -0700
Subject: Enable Menu > Quit to work again after startup on macOS

---
 gtk2_ardour/ardour_ui_startup.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'gtk2_ardour/ardour_ui_startup.cc')

diff --git a/gtk2_ardour/ardour_ui_startup.cc b/gtk2_ardour/ardour_ui_startup.cc
index f172305052..8327f5be06 100644
--- a/gtk2_ardour/ardour_ui_startup.cc
+++ b/gtk2_ardour/ardour_ui_startup.cc
@@ -551,6 +551,15 @@ ARDOUR_UI::load_session_from_startup_fsm ()
 void
 ARDOUR_UI::startup_done ()
 {
+	/* ShouldQuit is a desktop environment mechanism that tells the
+	   application it should exit for reasons external to the application
+	   itself.
+
+	   During startup, startupFSM handles ShouldQuit. But it is done now,
+	   and we have to take over responsibility.
+	*/
+	Application::instance()->ShouldQuit.connect (sigc::mem_fun (*this, &ARDOUR_UI::queue_finish));
+
 	use_config ();
 
 	WM::Manager::instance().show_visible ();
-- 
cgit v1.2.3