smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

Fix duplicate close-session dialog on macOS

Browse source 
Previously [GtkApplicationDelegate applicationShouldTerminate:]
triggered both StartupFSM::queue_finish and ArdourUI::queue_finish.
Both of which registered an idle-callback to call ArdourUI::finish.
This commit is contained in:
Robin Gareus 2023-10-09 17:19:17 +02:00
parent 120979bd76
commit c0d91362cf
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/startup_fsm.cc
View file

@ -98,7 +98,7 @@ StartupFSM::StartupFSM (EngineControl& amd)
Application* app = Application::instance (); Application* app = Application::instance ();
app->ShouldQuit.connect (sigc::mem_fun (*this, &StartupFSM::queue_finish)); app_quit_connection = app->ShouldQuit.connect (sigc::mem_fun (*this, &StartupFSM::queue_finish));
Gtkmm2ext::Keyboard::HideMightMeanQuit.connect (sigc::mem_fun (*this, &StartupFSM::dialog_hidden)); Gtkmm2ext::Keyboard::HideMightMeanQuit.connect (sigc::mem_fun (*this, &StartupFSM::dialog_hidden));
} }

6
gtk2_ardour/startup_fsm.h
View file

@ -85,7 +85,10 @@ class StartupFSM : public sigc::trackable
void handle_path (std::string const & path); void handle_path (std::string const & path);
bool complete() const { return _state == NotWaiting; } bool complete() const { return _state == NotWaiting; }
void set_complete () { _state = NotWaiting; } void set_complete () {
app_quit_connection.disconnect ();
_state = NotWaiting;
}
private: private:
bool new_user; bool new_user;
@ -126,6 +129,7 @@ class StartupFSM : public sigc::trackable
PluginScanDialog* plugin_scan_dialog; PluginScanDialog* plugin_scan_dialog;
sigc::connection current_dialog_connection; sigc::connection current_dialog_connection;
sigc::connection app_quit_connection;
sigc::signal1<void,Result> _signal_response; sigc::signal1<void,Result> _signal_response;