Don't raise an error when trying to auto-connect master to physical outputs if the connection already exists.

git-svn-id: svn://localhost/ardour2/branches/3.0@5624 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-09-03 00:12:57 +00:00
parent 3635710627
commit c30dbaad0e

View file

@ -675,7 +675,7 @@ Session::when_engine_running ()
Port* p = _master_out->output()->nth (n); Port* p = _master_out->output()->nth (n);
string connect_to = _engine.get_nth_physical_output (DataType (p->type()), n); string connect_to = _engine.get_nth_physical_output (DataType (p->type()), n);
if (!connect_to.empty()) { if (!connect_to.empty() && p->connected_to (connect_to) == false) {
if (_master_out->output()->connect (p, connect_to, this)) { if (_master_out->output()->connect (p, connect_to, this)) {
error << string_compose (_("cannot connect master output %1 to %2"), n, connect_to) error << string_compose (_("cannot connect master output %1 to %2"), n, connect_to)
<< endmsg; << endmsg;