diff options
| author | David Robillard <d@drobilla.net> | 2008-01-15 17:23:57 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-15 17:23:57 +0000 |
| commit | ac1a2557065726e31a4c9dfaec97b29393e043d8 (patch) | |
| tree | e250df162b37caec026e48dbbc1fcd8afec697dc /gtk2_ardour/ardour_ui.cc | |
| parent | b2e3b18dab5759737b620c92fbe9d0ff6dd177cb (diff) | |
Merge with trunk R2920.
git-svn-id: svn://localhost/ardour2/trunk@2921 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ca77ccb903..44a3d171c6 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -239,7 +239,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) /* lets get this party started */ try { - ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization); + if (ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization)) { + throw failed_constructor (); + } + setup_gtk_ardour_enums (); Config->set_current_owner (ConfigVariableBase::Interface); setup_profile (); @@ -247,7 +250,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) } catch (failed_constructor& err) { error << _("could not initialize Ardour.") << endmsg; // pass it on up - throw err; + throw; } /* we like keyboards */ |