From: Carl Hetherington <carl@carlh.net>
Date: Fri, 26 Jun 2009 12:13:41 +0000 (+0000)
Subject: Fix track selection interaction with route groups.
X-Git-Tag: 3.0-alpha5~3272
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=0758c7e16adafbd3ed69c188ffb5c05aa0ccf8de;p=ardour.git

Fix track selection interaction with route groups.

git-svn-id: svn://localhost/ardour2/branches/3.0@5276 d708f5d6-7413-0410-9779-e7cbd77b26cf
---

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 3a2239a755..8c2f0b54f6 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3941,10 +3941,9 @@ Editor::mouse_select_button_release (GdkEventButton* ev)
 Editor::TrackViewList *
 Editor::get_valid_views (TimeAxisView* track, RouteGroup* group)
 {
-	TrackViewList *v;
 	TrackViewList::iterator i;
 
-	v = new TrackViewList;
+	TrackViewList* v = new TrackViewList;
 
 	if (track == 0 && group == 0) {
 
@@ -3954,7 +3953,7 @@ Editor::get_valid_views (TimeAxisView* track, RouteGroup* group)
 			v->push_back (*i);
 		}
 
-	} else if ((track != 0 && group == 0) || (track != 0 && group != 0 && !group->is_active())) {
+	} else if ((track != 0 && group == 0) || (track != 0 && group != 0 && !group->active_property (RouteGroup::Select))) {
 		
 		/* just the view for this track
 		 */
@@ -3965,9 +3964,9 @@ Editor::get_valid_views (TimeAxisView* track, RouteGroup* group)
 		
 		/* views for all tracks in the route group */
 		
-		for (i  = track_views.begin(); i != track_views.end (); ++i) {
+		for (i = track_views.begin(); i != track_views.end (); ++i) {
 
-			if (group == 0 || (*i)->route_group() == group) {
+			if (group == 0 || ((*i)->route_group() == group && group->active_property (RouteGroup::Select))) {
 				v->push_back (*i);
 			}
 		}