summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui.cc
diff options
context:
space:
mode:
authorSakari Bergen <sakari.bergen@beatwaves.net>2010-04-02 22:58:05 +0000
committerSakari Bergen <sakari.bergen@beatwaves.net>2010-04-02 22:58:05 +0000
commit6ae418e5f57cfe64ceea9abbb74d861b06e50652 (patch)
tree6002159071adb34929a9dfb69b16d1620e52771d /gtk2_ardour/ardour_ui.cc
parent9943e0c6be105f14e4d5ba12508753a9699889de (diff)
Fix ordering issue with loading engine settings to the startup dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@6850 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
-rw-r--r--gtk2_ardour/ardour_ui.cc12
1 files changed, 6 insertions, 6 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);
}