Index: APPS/CHUI/TerminalNavigatieService/impl/TerminalNavigatieWatcher.cls.xml
===================================================================
diff -u -r2090 -r2092
--- APPS/CHUI/TerminalNavigatieService/impl/TerminalNavigatieWatcher.cls.xml	(.../TerminalNavigatieWatcher.cls.xml)	(revision 2090)
+++ APPS/CHUI/TerminalNavigatieService/impl/TerminalNavigatieWatcher.cls.xml	(.../TerminalNavigatieWatcher.cls.xml)	(revision 2092)
@@ -11,36 +11,39 @@
 Wait - (0 of "") = eenmalig, numeriek = wachten op een keyinput
 do ##class(APPS.CHUI.TerminalNavigatieService.impl.TerminalNavigatieWatcher).JobWatch(1)</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Wait</FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-	Set Wait=$G(Wait)
+	New Refresh,ComputerNaam,TaakUitGevoerd,Next
+	Set Refresh=""
 	Set ComputerNaam=##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam()
-	Set JobWatch=..%New()
-	
-	While $D(Wait) {
-		Do JobWatch.ControleerTaak(ComputerNaam)
-		If Wait {
-			Do DISPLAY^vhScherm("JOBWATCH")
-			Write @FCH
-			Read *Next:1
-			Write @FCS
-			If $LF($LB(27,45),Next) Quit
-		}
-		Else  {
-			Kill Wait
-		}
+	Do DISPLAY^vhScherm("JOBWATCH")
+	For  {
+		Set TaakUitGevoerd = ..ControleerEnVoerTaakUit(ComputerNaam)
+		if TaakUitGevoerd { Set Refresh = "" }
+		Do DISPLAY^vhScherm("JOBWATCH",,,,.Refresh)
+		Set Refresh="TIJD"
+		Write @FCH
+		Read *Next:1
+		Write @FCS
+		If $LF($LB(27,45),Next) Quit
 	}
 	Write @F11,@F1
 ]]></Implementation>
 </Method>
 
-<Method name="ControleerTaak">
+<Method name="ControleerEnVoerTaakUit">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ComputerNaam</FormalSpec>
+<ProcedureBlock>0</ProcedureBlock>
+<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Set NVS=##Class(APPS.CHUI.TerminalNavigatieService).%New()
-	Do:NVS.HeeftTaak(ComputerNaam) NVS.VoerTaakUit(ComputerNaam)
+	set TaakUitGevoerd = 0
+	Set TerminalNavigatieService=##Class(APPS.CHUI.TerminalNavigatieService).%New()
+	If TerminalNavigatieService.HeeftTaak(ComputerNaam) {
+		Do TerminalNavigatieService.VoerTaakUit(ComputerNaam)
+		set TaakUitGevoerd=1
+	}
+	quit TaakUitGevoerd
 ]]></Implementation>
 </Method>
 </Class>