X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fio.cc;h=b72c29aae15d15e4d852d41a535aafb6722dccd2;hb=8367b7cab344e75908744a95fda860c7fadff420;hp=5e9e5aa0c1a9accb7c9a48b3004e6a9deebc3095;hpb=302dc2bea34ac9b16b8010ce16f2bc72a3792fb1;p=ardour.git diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 5e9e5aa0c1..b72c29aae1 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -39,6 +39,7 @@ #include "ardour/debug.h" #include "ardour/io.h" #include "ardour/port.h" +#include "ardour/profile.h" #include "ardour/route.h" #include "ardour/session.h" #include "ardour/user_bundle.h" @@ -692,13 +693,16 @@ IO::set_state_2X (const XMLNode& node, int version, bool in) int IO::connecting_became_legal () { - int ret; + int ret = 0; assert (pending_state_node); connection_legal_c.disconnect (); - ret = make_connections (*pending_state_node, pending_state_node_version, pending_state_node_in); + // it's not required for TracksLive, as long as TracksLive's session does all the cennections when it's being loaded + if (!Profile->get_trx() ) { + ret = make_connections (*pending_state_node, pending_state_node_version, pending_state_node_in); + } delete pending_state_node; pending_state_node = 0; @@ -1176,7 +1180,6 @@ IO::parse_gain_string (const string& str, vector& ports) { string::size_type pos, opos; - pos = 0; opos = 0; ports.clear ();