Special case JACK, sample-rate cannot be changed for new sessions

diff --git a/gtk2_ardour/ardour_ui_session.cc b/gtk2_ardour/ardour_ui_session.cc
index 10abacd093899848e41cdbd46033ecf3120f1c8c..10b0f9e4b1e483141ef286905e6617159b16a1b7 100644 (file)
--- a/gtk2_ardour/ardour_ui_session.cc
+++ b/gtk2_ardour/ardour_ui_session.cc
@@ -544,6 +544,10 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
        if (from_startup_fsm && AudioEngine::instance()->running ()) {
                return build_session_stage_two (path, snap_name, session_template, bus_profile);
        }
+       /* Sample-rate cannot be changed when JACK is running */
+       if (!ARDOUR::AudioEngine::instance()->setup_required () && AudioEngine::instance()->running ()) {
+               return build_session_stage_two (path, snap_name, session_template, bus_profile);
+       }
 
        /* Ask for the Sample-rate to use with the new session */
        audio_midi_setup->set_position (WIN_POS_CENTER);