Fix disassociate all to only disassociate if required.
git-svn-id: svn://localhost/ardour2/branches/3.0@4512 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
dc78d4c241
commit
81cbf022ae
|
@ -282,7 +282,7 @@ PortMatrix::disassociate_all ()
|
||||||
{
|
{
|
||||||
ARDOUR::BundleList a = _ports[0].bundles ();
|
ARDOUR::BundleList a = _ports[0].bundles ();
|
||||||
ARDOUR::BundleList b = _ports[1].bundles ();
|
ARDOUR::BundleList b = _ports[1].bundles ();
|
||||||
|
|
||||||
for (ARDOUR::BundleList::iterator i = a.begin(); i != a.end(); ++i) {
|
for (ARDOUR::BundleList::iterator i = a.begin(); i != a.end(); ++i) {
|
||||||
for (uint32_t j = 0; j < (*i)->nchannels(); ++j) {
|
for (uint32_t j = 0; j < (*i)->nchannels(); ++j) {
|
||||||
for (ARDOUR::BundleList::iterator k = b.begin(); k != b.end(); ++k) {
|
for (ARDOUR::BundleList::iterator k = b.begin(); k != b.end(); ++k) {
|
||||||
|
@ -292,8 +292,10 @@ PortMatrix::disassociate_all ()
|
||||||
ARDOUR::BundleChannel (*i, j),
|
ARDOUR::BundleChannel (*i, j),
|
||||||
ARDOUR::BundleChannel (*k, l)
|
ARDOUR::BundleChannel (*k, l)
|
||||||
};
|
};
|
||||||
|
|
||||||
set_state (c, false);
|
if (get_state (c) == ASSOCIATED) {
|
||||||
|
set_state (c, false);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user