Remove now-deprecated non-zero page size in Adjustments used for SpinButtons;

[ardour.git] / gtk2_ardour / ardour_ui.cc

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 3376d1c8da6b004d1b4cc31a2bf95c8f3e9552c8..e51edbb6318c5ce336477216a6448d773aabc67b 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -396,26 +396,11 @@ ARDOUR_UI::~ARDOUR_UI ()
 {
        save_ardour_state ();
 
-       if (keyboard) {
-               delete keyboard;
-       }
-
-       if (editor) {
-               delete editor;
-       }
-
-       if (mixer) {
-               delete mixer;
-       }
-
-       if (add_route_dialog) {
-               delete add_route_dialog;
-       }
-
-
-       if (new_session_dialog) {
-               delete new_session_dialog;
-       }
+       delete keyboard;
+       delete editor;
+       delete mixer;
+       delete add_route_dialog;
+       delete new_session_dialog;
 }
 
 void
@@ -2273,8 +2258,9 @@ ARDOUR_UI::idle_load (const Glib::ustring& path)
        }
 }
 
+/** @param offer_quit true to offer a Cancel button, otherwise call it Quit */
 bool
-ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be_new)
+ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be_new, bool offer_cancel)
 {
        bool existing_session = false;
        Glib::ustring session_name;
@@ -2315,6 +2301,7 @@ ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be
        new_session_dialog->set_current_page (0);
        new_session_dialog->set_existing_session (existing_session);
        new_session_dialog->reset_recent();
+       new_session_dialog->set_offer_cancel (offer_cancel);
 
        do {
                new_session_dialog->set_have_engine (backend_audio_is_running);