summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-07-06 11:34:00 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-07-06 11:34:00 +0000
commit6cccf3ce7dc86998d6797f393bec5b69610fc5f3 (patch)
treecbaa9bead8007e52ab1e32919fb3aa0b9c5200bc /gtk2_ardour
parent2f9184d65395da75a43ea21ffb5f11b8d577d27a (diff)
group active status honor patch from lincoln spiteri
git-svn-id: svn://localhost/ardour2/branches/3.0@7382 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor_selection.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index fda5155e03..fdc1fe2ad0 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -294,6 +294,7 @@ void
Editor::mapover_tracks (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeAxisView* basis, PBD::PropertyID prop) const
{
RouteTimeAxisView* route_basis = dynamic_cast<RouteTimeAxisView*> (basis);
+
if (route_basis == 0) {
return;
}
@@ -302,7 +303,8 @@ Editor::mapover_tracks (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeA
tracks.insert (route_basis);
RouteGroup* group = route_basis->route()->route_group();
- if (group && group->enabled_property (prop)) {
+
+ if (group && group->enabled_property(prop) && group->enabled_property (Properties::active.property_id) ) {
/* the basis is a member of an active route group, with the appropriate
properties; find other members */
@@ -317,6 +319,7 @@ Editor::mapover_tracks (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeA
/* call the slots */
uint32_t const sz = tracks.size ();
+
for (set<RouteTimeAxisView*>::iterator i = tracks.begin(); i != tracks.end(); ++i) {
sl (**i, sz);
}