From: Len Ovens <len@ovenwerks.net>
Date: Sun, 17 Jan 2016 22:17:02 +0000 (-0800)
Subject: Groups: Fix un/set hidden/show should reset RID for tracks involved.
X-Git-Tag: 4.7~331
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=ef7c6730cb5ea8ee545c768a4215859264c06730;p=ardour.git

Groups: Fix un/set hidden/show should reset RID for tracks involved.
---

diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index 041cef8892..85644359f6 100644
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -517,6 +517,7 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
 			}
 		}
 	}
+	_editor->_routes->reset_remote_control_ids ();
 }
 
 void
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 2580fa9672..1afc2d7a34 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -2243,11 +2243,7 @@ MackieControlProtocol::is_hidden (boost::shared_ptr<Route> r) const
 	if (!r) {
 		return false;
 	}
-	bool group = false;
-	if (r->route_group()) {
-		group = r->route_group()->is_hidden();
-	}
-	return (((r->remote_control_id()) >>31) != 0) || group;
+	return (((r->remote_control_id()) >>31) != 0);
 }
 
 boost::shared_ptr<Route>