X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Froute_group_member.cc;h=280d193fba1d90dc11b3cff20b18c878529aa2ff;hp=d0701f57da3bfbb3298f7abe3afbf1bed95f7b89;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=23794eca5b4c352709e9054a9f32cab01228af25

diff --git a/libs/ardour/route_group_member.cc b/libs/ardour/route_group_member.cc
index d0701f57da..280d193fba 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
 {
-	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)));
+	bool active_for_predicate = _route_group && (_route_group->*predicate)() && _route_group->is_active();
+
+	return ((gcd != PBD::Controllable::NoGroup) && (gcd != PBD::Controllable::ForGroup)) &&
+		_route_group && 
+		((active_for_predicate && (gcd != PBD::Controllable::InverseGroup)) ||
+		 (!active_for_predicate && (gcd == PBD::Controllable::InverseGroup)));
 }