From 6c2dd7e9969a71835b55304e4ca8eb8ad90362d6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 19 Oct 2009 20:30:09 +0000 Subject: [PATCH] Fix 2074: setting the NSD to not connect outputs to anything is ignored. git-svn-id: svn://localhost/ardour2/branches/3.0@5811 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index fcdf1d08a7..3750cdd768 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2187,12 +2187,14 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib /// @todo some minor tweaks. - if (_startup->connect_outs_to_master()) { - oconnect = AutoConnectMaster; - } else if (_startup->connect_outs_to_physical()) { - oconnect = AutoConnectPhysical; - } else { - oconnect = AutoConnectOption (0); + oconnect = AutoConnectOption (0); + + if (_startup->connect_outputs ()) { + if (_startup->connect_outs_to_master()) { + oconnect = AutoConnectMaster; + } else if (_startup->connect_outs_to_physical()) { + oconnect = AutoConnectPhysical; + } } nphysin = (uint32_t) _startup->input_limit_count();