Index: UI/Utils/MAppLauncher/MainForm.cls.xml
===================================================================
diff -u -r3837 -r4632
--- UI/Utils/MAppLauncher/MainForm.cls.xml	(.../MainForm.cls.xml)	(revision 3837)
+++ UI/Utils/MAppLauncher/MainForm.cls.xml	(.../MainForm.cls.xml)	(revision 4632)
@@ -434,8 +434,26 @@
 <SoapBindingStyle>document</SoapBindingStyle>
 <SoapBodyUse>literal</SoapBodyUse>
 <Implementation><![CDATA[
- Set ..ComKey=$G(^IPCom("IP",MApplication.GetClientIP()))
- Kill ^IPCom("IP",MApplication.GetClientIP())
+
+   ;d WLIP^vhDBG(97,"before wait")
+ New ClientIP,ComKey,i,UserQuits
+ Set ClientIP=MApplication.GetClientIP()
+ Set ComKey=$G(^IPCom("IP",ClientIP))
+ For i=1:1:50 Quit:(ComKey'="")  Do
+ . Hang 0.1
+ . Set ComKey=$G(^IPCom("IP",ClientIP))
+ . ;d WLIP^vhDBG(97,i_" wait 0.1 sec")
+
+ Set UserQuits=0
+ For  Quit:(ComKey'="")||(UserQuits=1)  Do
+ . Hang 1
+ . Set ComKey=$G(^IPCom("IP",ClientIP))
+ . If (ComKey="") && (MApplication.MessageBox("Nogmaals proberen om de IPCom-Key uit te lezen?", "IPCom Key is leeg ("_ClientIP_")", $$$MBOKCANCEL)=$$$mrCancel) Do
+ . . Set UserQuits=1
+
+   ;d WLIP^vhDBG(97,"After wait : IPCom Key = "_ComKey)
+ Set ..ComKey=ComKey
+ Kill ^IPCom("IP",ClientIP)
  Quit
 ]]></Implementation>
 </Method>
@@ -591,6 +609,7 @@
  ;-----------------------------------------------------------------------------
 pprViaIPCom
 #define IsGAProd   tmpApplic?1(1"TBX",1"GRP",1"TLM",1"ASM",1"KAD")
+
  Merge IPCom=^IPCom("D",..ComKey)
  Set BaseNode=$G(IPCom)
  Set tmpApplic=$P(BaseNode,"`",1)