summaryrefslogtreecommitdiff
path: root/libs/ardour/route_group.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-11-04 16:41:02 +0000
committerCarl Hetherington <carl@carlh.net>2011-11-04 16:41:02 +0000
commit98370b39c4b3350843cf0fa3b3b4ab13e8147886 (patch)
treee8a7efc25c36a8d1918bddd7e513959edeadc26e /libs/ardour/route_group.cc
parent69413ea089911fe2dec669e48f28ac4aeb8514b3 (diff)
Make sure that the old route group is left properly when
setting a new one. Should fix #4441 and #4404. git-svn-id: svn://localhost/ardour2/branches/3.0@10438 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/route_group.cc')
-rw-r--r--libs/ardour/route_group.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc
index 188ec71f87..045067013d 100644
--- a/libs/ardour/route_group.cc
+++ b/libs/ardour/route_group.cc
@@ -141,8 +141,10 @@ RouteGroup::add (boost::shared_ptr<Route> r)
return 0;
}
- r->leave_route_group ();
-
+ if (r->route_group()) {
+ r->route_group()->remove (r);
+ }
+
routes->push_back (r);
r->join_route_group (this);