X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_handle.cc;h=e9284b7c9849e431936253a043edff1f5cab61a5;hb=204baa31d842d4c2f833d319b6fa55e402a1bfb8;hp=f1f6147960c088d26c25dfb722e2648646abea23;hpb=aae367b63c9b619db1e40f27dc334c6987219481;p=ardour.git

diff --git a/libs/ardour/session_handle.cc b/libs/ardour/session_handle.cc
index f1f6147960..e9284b7c98 100644
--- a/libs/ardour/session_handle.cc
+++ b/libs/ardour/session_handle.cc
@@ -17,7 +17,9 @@
 
 */
 
+#include "pbd/demangle.h"
 #include "pbd/error.h"
+#include "pbd/boost_debug.h"
 
 #include "ardour/session.h"
 #include "ardour/session_handle.h"
@@ -29,12 +31,12 @@ using namespace ARDOUR;
 using namespace PBD;
 
 SessionHandlePtr::SessionHandlePtr (Session* s)
-	: _session (s) 
+	: _session (s)
 {
 	if (_session) {
-		_session->GoingAway.connect (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
+		_session->DropReferences.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
 	}
-}	
+}
 
 void
 SessionHandlePtr::set_session (Session* s)
@@ -47,7 +49,7 @@ SessionHandlePtr::set_session (Session* s)
 
 	if (s) {
 		_session = s;
-		_session->GoingAway.connect (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
+		_session->DropReferences.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
 	}
 }
 
@@ -61,13 +63,29 @@ SessionHandlePtr::session_going_away ()
 
 
 SessionHandleRef::SessionHandleRef (Session& s)
-	: _session (s) 
+	: _session (s)
 {
-	_session.GoingAway.connect (*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"),
+	        string_compose("SessionHandleRef exists across session deletion! Dynamic type: %1 @ %2",
+	                       PBD::demangled_name (*this), this))
+	     << endl;
 }