1 files changed, 15 insertions, 4 deletions
diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc
index 1af1e0c968..102cd724dd 100644
--- a/gtk2_ardour/route_processor_selection.cc
+++ b/gtk2_ardour/route_processor_selection.cc
@@ -26,6 +26,7 @@
 #include "ardour/route.h"
 
 #include "route_processor_selection.h"
+#include "gui_thread.h"
 
 #include "i18n.h"
 
@@ -92,18 +93,28 @@ RouteRedirectSelection::add (boost::shared_ptr<Route> r)
 {
 	if (find (routes.begin(), routes.end(), r) == routes.end()) {
 		routes.push_back (r);
+		r->GoingAway.connect (boost::bind (&RouteRedirectSelection::removed, this, boost::weak_ptr<Route>(r)));
+		RoutesChanged();
+	}
+}
 
-		// XXX SHAREDPTR FIXME
-		// void (RouteRedirectSelection::*pmf)(Route*) = &RouteRedirectSelection::remove;
-		// r->GoingAway.connect (sigc::bind (sigc::mem_fun(*this, pmf), r));
+void
+RouteRedirectSelection::removed (boost::weak_ptr<Route> wr)
+{
+	boost::shared_ptr<Route> r (wr.lock());
 
-		RoutesChanged();
+	if (!r) {
+		return;
 	}
+
+	remove (r);
 }
 
 void
 RouteRedirectSelection::remove (boost::shared_ptr<Route> r)
 {
+	ENSURE_GUI_THREAD (*this, &RouteRedirectSelection::remove, r);
+
 	list<boost::shared_ptr<Route> >::iterator i;
 	if ((i = find (routes.begin(), routes.end(), r)) != routes.end()) {
 		routes.erase (i);