From 1b5354632fc1f0f2b5f96a07b20d35ac5c64628b Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 3 Aug 2017 18:43:41 +0200 Subject: [PATCH] Fix Session > New (cancel retains the current session if any) --- gtk2_ardour/ardour_ui.cc | 1 + gtk2_ardour/ardour_ui_ed.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index d6389d68b4..31ddbeca29 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3483,6 +3483,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri // user quits from the main 'Session Setup' dialog (i.e. reaching this // point does NOT indicate an abnormal termination). Therefore, let's // behave gracefully (i.e. let's do some cleanup) before we call exit() + assert (!_session); ARDOUR::cleanup (); pthread_cancel_all (); diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index bc40973f2f..b1a76f3faa 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -162,7 +162,7 @@ ARDOUR_UI::install_actions () /* the real actions */ - act = global_actions.register_action (main_actions, X_("New"), _("New..."), hide_return (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::get_session_parameters), true, true, ""))); + act = global_actions.register_action (main_actions, X_("New"), _("New..."), hide_return (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::get_session_parameters), false, true, ""))); global_actions.register_action (main_actions, X_("Open"), _("Open..."), sigc::mem_fun(*this, &ARDOUR_UI::open_session)); global_actions.register_action (main_actions, X_("Recent"), _("Recent..."), sigc::mem_fun(*this, &ARDOUR_UI::open_recent_session));