Fix 2074: setting the NSD to not connect outputs to anything is ignored.
authorCarl Hetherington <carl@carlh.net>
Mon, 19 Oct 2009 20:30:09 +0000 (20:30 +0000)
committerCarl Hetherington <carl@carlh.net>
Mon, 19 Oct 2009 20:30:09 +0000 (20:30 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@5811 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/ardour_ui.cc

index fcdf1d08a7a8a028d1ea4e5f216a93c0fc5e39ff..3750cdd768dc235ec890abeac2a03ed5d63d2fff 100644 (file)
@@ -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();