diff options
| -rw-r--r-- | libs/ardour/route_group_member.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/ardour/route_group_member.cc b/libs/ardour/route_group_member.cc index d0701f57da..9ca94bfb2b 100644 --- a/libs/ardour/route_group_member.cc +++ b/libs/ardour/route_group_member.cc @@ -39,9 +39,10 @@ RouteGroupMember::set_route_group (RouteGroup *rg) bool RouteGroupMember::use_group (PBD::Controllable::GroupControlDisposition gcd, bool (RouteGroup::*predicate)(void) const) const { + bool active_for_predicate = _route_group && (_route_group->*predicate)() && _route_group->is_active(); + return (gcd != PBD::Controllable::NoGroup) && - _route_group && - (_route_group->*predicate)() && - (((_route_group->is_active()) && (gcd != PBD::Controllable::InverseGroup)) || - ((!_route_group->is_active()) && (gcd == PBD::Controllable::InverseGroup))); + _route_group && + ((active_for_predicate && (gcd != PBD::Controllable::InverseGroup)) || + (!active_for_predicate && (gcd == PBD::Controllable::InverseGroup))); } |