diff options
author | Carl Hetherington <carl@carlh.net> | 2009-09-03 00:12:57 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-09-03 00:12:57 +0000 |
commit | c30dbaad0e1b4c686d3ca6853dc95ee8837aafed (patch) | |
tree | 48eb9c89e1c82781be88d54bd65404e11739a26d /libs | |
parent | 36357106277408b8aaefbbdc12f6585f2dbe00cd (diff) |
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
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/session.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 06967127ee..d3acc19319 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -675,7 +675,7 @@ Session::when_engine_running () Port* p = _master_out->output()->nth (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)) { error << string_compose (_("cannot connect master output %1 to %2"), n, connect_to) << endmsg; |