allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Fix ordering issue with loading engine settings to the startup dialog

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6850 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Sakari Bergen
2010-04-02 22:58:05 +00:00
parent 9943e0c6be
commit 6ae418e5f5
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/ardour_ui.cc
View File

@@ -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);
}

3
gtk2_ardour/engine_dialog.cc
View File

@@ -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;