X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_handle.cc;h=14ba994dc3e9ff83f4edb6c2b11a9fca1c254e33;hb=ed72df29b79f9e2dc7482f07c39010b4523c4a8e;hp=1cd78c8aac0d821b181d366123bcdef44b95682b;hpb=f450df300c9c057141a4caf79ff6dbfbf58492d9;p=ardour.git

diff --git a/libs/ardour/session_handle.cc b/libs/ardour/session_handle.cc
index 1cd78c8aac..14ba994dc3 100644
--- a/libs/ardour/session_handle.cc
+++ b/libs/ardour/session_handle.cc
@@ -18,6 +18,7 @@
 */
 
 #include "pbd/error.h"
+#include "pbd/boost_debug.h"
 
 #include "ardour/session.h"
 #include "ardour/session_handle.h"
@@ -32,7 +33,7 @@ SessionHandlePtr::SessionHandlePtr (Session* s)
 	: _session (s) 
 {
 	if (_session) {
-		_session->GoingAway.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
+		_session->DropReferences.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
 	}
 }	
 
@@ -47,7 +48,7 @@ SessionHandlePtr::set_session (Session* s)
 
 	if (s) {
 		_session = s;
-		_session->GoingAway.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
+		_session->DropReferences.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
 	}
 }
 
@@ -63,11 +64,23 @@ SessionHandlePtr::session_going_away ()
 SessionHandleRef::SessionHandleRef (Session& s)
 	: _session (s) 
 {
-	_session.GoingAway.connect_same_thread (*this, boost::bind (&SessionHandleRef::session_going_away, this));
+	_session.DropReferences.connect_same_thread (*this, boost::bind (&SessionHandleRef::session_going_away, this));
+	_session.Destroyed.connect_same_thread (*this, boost::bind (&SessionHandleRef::insanity_check, this));
 }	
 
+SessionHandleRef::~SessionHandleRef ()
+{
+}
+
 void
 SessionHandleRef::session_going_away ()
 {
-	error << string_compose (_("programming error: %1"), "SessionHandleRef exists across sesssion deletion!") << endmsg;
+	/* a handleRef is allowed to exist at the time of DropReferences, but not at the time of Destroyed
+	 */
+}
+
+void
+SessionHandleRef::insanity_check ()
+{
+	cerr << string_compose (_("programming error: %1"), "SessionHandleRef exists across sesssion deletion!") << endl;
 }