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

differentiate between StartupFSM::{Exit,Quit}Program

Browse source 
QuitProgram is a user choice, ExitProgram is an error condition
This commit is contained in:
Paul Davis 2022-11-28 10:18:43 -07:00
parent c19f3f07b0
commit 21c6c723c4
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/ardour_ui_startup.cc
View file

@ -525,6 +525,7 @@ ARDOUR_UI::sfsm_response (StartupFSM::Result r)
switch (r) { switch (r) {
case StartupFSM::ExitProgram: { case StartupFSM::ExitProgram: {
/* failure mode */
std::stringstream str;; std::stringstream str;;
dump_errors (str, 10); dump_errors (str, 10);
std::string msg (string_compose (_("<span font_size=\"large\" font_weight=\"bold\">Something went seriously wrong. %1 cannot continue.</span>\n\n" std::string msg (string_compose (_("<span font_size=\"large\" font_weight=\"bold\">Something went seriously wrong. %1 cannot continue.</span>\n\n"
@ -539,6 +540,11 @@ ARDOUR_UI::sfsm_response (StartupFSM::Result r)
} }
break; break;
case StartupFSM::QuitProgram:
/* user explicitly requested quit */
queue_finish ();
break;
case StartupFSM::LoadSession: case StartupFSM::LoadSession:
if (load_session_from_startup_fsm () == 0) { if (load_session_from_startup_fsm () == 0) {

10
gtk2_ardour/startup_fsm.cc
View file

@ -124,7 +124,7 @@ StartupFSM::dialog_hidden (Gtk::Window* /* ignored */)
void void
StartupFSM::queue_finish () StartupFSM::queue_finish ()
{ {
_signal_response (ExitProgram); _signal_response (QuitProgram);
} }
void void
@ -232,7 +232,7 @@ StartupFSM::dialog_response_handler (int response, StartupFSM::DialogID dialog_i
show_session_dialog (new_session_required); show_session_dialog (new_session_required);
break; break;
default: default:
_signal_response (ExitProgram); _signal_response (QuitProgram);
} }
default: default:
/* ERROR */ /* ERROR */
@ -266,7 +266,7 @@ StartupFSM::dialog_response_handler (int response, StartupFSM::DialogID dialog_i
break; break;
default: default:
_signal_response (ExitProgram); _signal_response (QuitProgram);
break; break;
} }
break; break;
@ -300,7 +300,7 @@ StartupFSM::dialog_response_handler (int response, StartupFSM::DialogID dialog_i
} }
break; break;
default: default:
_signal_response (ExitProgram); _signal_response (QuitProgram);
} }
break; break;
default: default:
@ -336,7 +336,7 @@ StartupFSM::dialog_response_handler (int response, StartupFSM::DialogID dialog_i
} }
break; break;
default: default:
_signal_response (ExitProgram); _signal_response (QuitProgram);
break; break;
} }
default: default:

1
gtk2_ardour/startup_fsm.h
View file

@ -46,6 +46,7 @@ class StartupFSM : public sigc::trackable
enum Result { enum Result {
LoadSession, LoadSession,
ExitProgram, ExitProgram,
QuitProgram,
}; };
enum MainState { enum MainState {