diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-30 16:47:09 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-30 16:47:09 +0000 |
commit | f346e0b7ff8f80e3a178050674ce60400af08425 (patch) | |
tree | b595f8a84b22d71a06292466695051fa5f8aecb5 /gtk2_ardour | |
parent | 3d70a76240f9184ed988e571f6a8bc8c5d3cfe17 (diff) |
patch from carl for #2074 (already present in 3.0), fixes behaviour when auto-connect is specifically disabled for a new session
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5982 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index b4b54fa70d..3a8d0748ce 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2244,14 +2244,16 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib } /// @todo some minor tweaks. + + oconnect = AutoConnectOption (0); - if (new_session_dialog->connect_outs_to_master()) { - oconnect = AutoConnectMaster; - } else if (new_session_dialog->connect_outs_to_physical()) { - oconnect = AutoConnectPhysical; - } else { - oconnect = AutoConnectOption (0); - } + if (new_session_dialog->connect_outputs()) { + if (new_session_dialog->connect_outs_to_master()) { + oconnect = AutoConnectMaster; + } else if (new_session_dialog->connect_outs_to_physical()) { + oconnect = AutoConnectPhysical; + } + } nphysin = (uint32_t) new_session_dialog->input_limit_count(); nphysout = (uint32_t) new_session_dialog->output_limit_count(); |