diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-07 20:14:16 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-07 20:14:16 +0000 |
| commit | 18695cdfe3cc600360ad15d37d55eb6a4e8d4a2f (patch) | |
| tree | e91b228c968145e54ea57b1206c7b763e28c04e3 /libs/ardour/session_state.cc | |
| parent | 3b6300156b240e3daeab3cd34d1b937a20a657f2 (diff) | |
merge keybindings/menus from SAE; report duplicate port errors during session loading more usefully; do not do disk i/o from inactive tracks (related: move Route::_active to IO::_active
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2834 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_state.cc')
| -rw-r--r-- | libs/ardour/session_state.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index f4fceb1d91..03428f6035 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -323,11 +323,10 @@ Session::second_stage_init (bool new_session) } /* handle this one in a different way than all others, so that its clear what happened */ - + catch (AudioEngine::PortRegistrationFailure& err) { - error << _("Unable to create all required ports") - << endmsg; - return -1; + destroy (); + throw; } catch (...) { |