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

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();