diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 12 | ||||
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 58c6886026..c24d16bcd1 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -300,6 +300,12 @@ ARDOUR_UI::run_startup (bool should_be_new) if (_startup == 0) { _startup = new ArdourStartup (); } + + XMLNode* audio_setup = Config->extra_xml ("AudioSetup"); + + if (audio_setup && _startup->engine_control()) { + _startup->engine_control()->set_state (*audio_setup); + } _startup->set_new_only (should_be_new); _startup->present (); @@ -636,12 +642,6 @@ Please consider the possibilities, and perhaps (re)start JACK.")); void ARDOUR_UI::startup () { - XMLNode* audio_setup = Config->extra_xml ("AudioSetup"); - - if (audio_setup && _startup && _startup->engine_control()) { - _startup->engine_control()->set_state (*audio_setup); - } - if (get_session_parameters (true, ARDOUR_COMMAND_LINE::new_session)) { exit (1); } diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 3717feb038..87431ee6c0 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -1187,7 +1187,8 @@ EngineControl::set_state (const XMLNode& root) if (!prop || prop->value().empty()) { - if ( using_dummy && ( child->name() == "interface" || child->name() == "inputdevice" || child->name() == "outputdevice" )) + if ((using_dummy && ( child->name() == "interface" || child->name() == "inputdevice" || child->name() == "outputdevice" )) || + child->name() == "timeout") continue; error << string_compose (_("AudioSetup value for %1 is missing data"), child->name()) << endmsg; continue; |