Index: cQZSTART.mac.rou
===================================================================
diff -u -r49108 -r60822
--- cQZSTART.mac.rou	(.../cQZSTART.mac.rou)	(revision 49108)
+++ cQZSTART.mac.rou	(.../cQZSTART.mac.rou)	(revision 60822)
@@ -170,7 +170,7 @@
 	I 'OK,I?1.N S K=I
 IOSB	;check if Terminal Server
 	I IP?3(1.3N1".")1.3N,$D(^cLOG($ZCVT($ZU(110),"U"),"TS",IP)) S OK=0 D
-	. F ii=1:1:3 D  Q:OK
+	. F ii=1:1:1 D  Q:OK
 	.. S CLN=$$CLN(1),IPCLN=0 I CLN'="" S IPCLN=$P($ZU(54,13,CLN),",")
 	.. I 'OK,IPCLN?3(1.3N1".")1.3N,$D(^cQSYS(CFG,"FIXED","IP",IPCLN)) S K=^(IPCLN),OK=1
 IOSY	S:K="" K=0 S ^cJOB(JOB,$ZCVT($ZU(110),"U"),"job","IO")=K
@@ -266,11 +266,12 @@
 	I '+$G(X),$G(^["%SYS"]cLOG(0,"NETBIOSNAME"),1) Q ""  ; Modified 12.02.2006
 	I $$PV($G(io)) Q ""  	;scanners
 	I $I'["|TNT|" Q ""
-	U 0:(:/ECHO=0)
-	W $C(27),"P2000;0{Sub main",$C(13),"SendKeys Environ$(""computername"")",$C(13)
-	W "SendKeys ""{ENTER}""",$C(13),"End Sub",$C(13),$C(27),"\"
-	R K:3
-	U 0:(:/ECHO=1)
+	;U 0:(:/ECHO=0)
+	;W $C(27),"P2000;0{Sub main",$C(13),"SendKeys Environ$(""computername"")",$C(13)
+	;W "SendKeys ""{ENTER}""",$C(13),"End Sub",$C(13),$C(27),"\"
+	;R K:3
+	;U 0:(:/ECHO=1)
+	Set K=##class(APPS.CHUI.NativeCommandoService).%New().ReflectionComputerName()
 	S K=$TR($ZSTRIP(K,"*C"),"&�""'(��!��)_","1234567890�-")  ;Capslock conversion
 	S K=$ZCONVERT(K,"U")  ;Uppercase conversion
 CNNZ	Q K
@@ -279,11 +280,12 @@
 	I '+$G(X),$G(^["%SYS"]cLOG(0,"NETBIOSNAME"),1) Q ""  ; Modified 12.02.2006
 	I $$PV($G(io)) Q ""  	;scanners
 	I $I'["|TNT|" Q ""
-	U 0:(:/ECHO=0)
-	W $C(27),"P2000;0{Sub main",$C(13),"SendKeys Environ$(""clientname"")",$C(13)
-	W "SendKeys ""{ENTER}""",$C(13),"End Sub",$C(13),$C(27),"\"
-	R K:3
-	U 0:(:/ECHO=1)
+	;U 0:(:/ECHO=0)
+	;W $C(27),"P2000;0{Sub main",$C(13),"SendKeys Environ$(""clientname"")",$C(13)
+	;W "SendKeys ""{ENTER}""",$C(13),"End Sub",$C(13),$C(27),"\"
+	;R K:3
+	;U 0:(:/ECHO=1)
+	Set K=##class(APPS.CHUI.NativeCommandoService).%New().ReflectionRDPClientName()
 	S K=$TR($ZSTRIP(K,"*C"),"&�""'(��!��)_","1234567890�-")  ;Capslock conversion
 	S K=$ZCONVERT(K,"U")   ;Uppercase conversion
 CLNZ	Q K