Index: Tools/DebugWindow.cls.xml
===================================================================
diff -u -r2425 -r3433
--- Tools/DebugWindow.cls.xml	(.../DebugWindow.cls.xml)	(revision 2425)
+++ Tools/DebugWindow.cls.xml	(.../DebugWindow.cls.xml)	(revision 3433)
@@ -8,7 +8,11 @@
 </Property>
 
 <Method name="Activate">
-<Implementation><![CDATA[	set ^Tools.DebugWindow(..ClientIP) = ##class(TECH.DateTime).CurrentTimeStamp()
+<Implementation><![CDATA[
+	Lock (^Tools.DebugWindow(..ClientIP)#"S"):0
+	if $Test = 0  {
+		Do ##Class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.IllegalUsageException).%New("Er zit een exclusive lock op ^Tools.DebugWindow("_..ClientIP_")"))
+	}
 ]]></Implementation>
 </Method>
 
@@ -26,12 +30,36 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TerminalGetData">
+<Implementation><![CDATA[
+	Do ..Activate()
+	
+	#dim Index As %String = ""
+	try{
+	While 1 {
+		#dim LastIndex As %String = $order(^Tools.DebugWindow(..ClientIP,""),-1)
+		for  { set Index = $order(^Tools.DebugWindow(..ClientIP,Index)) quit:Index>LastIndex  quit:Index=""
+			Write !,^(Index)
+			kill ^Tools.DebugWindow(..ClientIP,Index)
+		}
+		hang .2
+	}
+	} catch {
+		;; unlock on ctrl-C
+		Lock -(^Tools.DebugWindow(..ClientIP)#"S"):0
+	}
+]]></Implementation>
+</Method>
+
 <Method name="IsActive">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>IP:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim IsActive As %Boolean = $data(^Tools.DebugWindow(IP))
+	Lock ^Tools.DebugWindow(IP):0
+	#dim IsActive = $$$Not($Test)
+	;;als er niemand luistert is de lock gelukt, dus unlocken
+	Lock -^Tools.DebugWindow(IP):0
 	quit IsActive
 ]]></Implementation>
 </Method>
@@ -65,7 +93,8 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	if $length(..ClientIP) kill ^Tools.DebugWindow(..ClientIP)
+	if $length(..ClientIP) Lock -(^Tools.DebugWindow(..ClientIP)#"S"):0
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>