From 98370b39c4b3350843cf0fa3b3b4ab13e8147886 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Fri, 4 Nov 2011 16:41:02 +0000
Subject: [PATCH] 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
---
 libs/ardour/route_group.cc | 6 ++++--
 1 file 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);