X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fsession_handle.cc;h=2a14f8a4bc62800b2231f48a64c58bb657ed1481;hb=32b73439275dbe2cccaa2a71026a951ea46d24b9;hp=f36fff47850298b54a51a9f16c111d77dd809afa;hpb=dad0671ba04d5c8151fbc448f3e35243f28c87c7;p=ardour.git

diff --git a/libs/ardour/session_handle.cc b/libs/ardour/session_handle.cc
index f36fff4785..2a14f8a4bc 100644
--- a/libs/ardour/session_handle.cc
+++ b/libs/ardour/session_handle.cc
@@ -19,24 +19,24 @@
 
 #include "pbd/demangle.h"
 #include "pbd/error.h"
-#include "pbd/boost_debug.h"
 
+#include "ardour/boost_debug.h"
 #include "ardour/session.h"
 #include "ardour/session_handle.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
 SessionHandlePtr::SessionHandlePtr (Session* s)
-	: _session (s) 
+	: _session (s)
 {
 	if (_session) {
 		_session->DropReferences.connect_same_thread (_session_connections, boost::bind (&SessionHandlePtr::session_going_away, this));
 	}
-}	
+}
 
 void
 SessionHandlePtr::set_session (Session* s)
@@ -63,11 +63,11 @@ SessionHandlePtr::session_going_away ()
 
 
 SessionHandleRef::SessionHandleRef (Session& s)
-	: _session (s) 
+	: _session (s)
 {
 	_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 ()
 {
@@ -83,9 +83,11 @@ SessionHandleRef::session_going_away ()
 void
 SessionHandleRef::insanity_check ()
 {
+#ifndef NDEBUG
 	cerr << string_compose (
 	        _("programming error: %1"),
-	        string_compose("SessionHandleRef exists across sesssion deletion! Dynamic type: %1",
-	                       PBD::demangled_name (*this)))
+	        string_compose("SessionHandleRef exists across session deletion! Dynamic type: %1 @ %2",
+	                       PBD::demangled_name (*this), this))
 	     << endl;
+#endif
 }