Use weak-ptr for source added/removed signals (2/2)

1 files changed, 10 insertions, 1 deletions

diff --git a/gtk2_ardour/editor_sources.cc b/gtk2_ardour/editor_sources.cc
index 73818435f9..29043c478f 100644
--- a/gtk2_ardour/editor_sources.cc
+++ b/gtk2_ardour/editor_sources.cc
@@ -287,7 +287,7 @@ EditorSources::set_session (ARDOUR::Session* s)
 		
 		ARDOUR::RegionFactory::CheckNewRegion.connect (add_source_connection, MISSING_INVALIDATOR, boost::bind (&EditorSources::add_source, this, _1), gui_context());
 
-		s->SourceRemoved.connect (remove_source_connection, MISSING_INVALIDATOR, boost::bind (&EditorSources::remove_source, this, _1), gui_context());
+		s->SourceRemoved.connect (remove_source_connection, MISSING_INVALIDATOR, boost::bind (&EditorSources::remove_weak_source, this, _1), gui_context());
 
 		redisplay();
 
@@ -297,6 +297,15 @@ EditorSources::set_session (ARDOUR::Session* s)
 }
 
 void
+EditorSources::remove_weak_source (boost::weak_ptr<ARDOUR::Source> src)
+{
+	boost::shared_ptr<ARDOUR::Source> source = src.lock();
+	if (source) {
+		remove_source (source);
+	}
+}
+
+void
 EditorSources::remove_source (boost::shared_ptr<ARDOUR::Source> source)
 {
 	TreeModel::iterator i;