From 68c6a351de497a135785e3d288ef45f33ec1979a Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Sun, 28 Apr 2024 13:36:35 +0200
Subject: [PATCH] Fixed the Scan prompt getting stuck on screen with DarnUI

---
 mod/Cyberware.esm             | Bin 311946 -> 312414 bytes
 src/CWxScannerQuestScript.gek |   6 +++---
 src/CWxScannerStop.gek        |  10 ++++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/mod/Cyberware.esm b/mod/Cyberware.esm
index a93d98944c7879c077d7402cd0302953abb70ec7..67286c54c48847b9ac8bb89e28b29c241b82ff0e 100644
GIT binary patch
delta 2043
zcmZvcYfKbZ6vywKIm&{t3kxF7ELKr)5h<Zjic-=dsFfo70zt5VRa4!NK77Qq+7zl(
zBPuG=i|DM{*7#txAlmD~5{Q1#SWQeJ#u_y?Db*MiTOVzG_TH5pc53&-+4Dd1JLjHr
zZe}*rL|$7Txg|m9h;211$-?Dt+D<2*AB$7k8f>qNIHkV9wy@1yI1{tTCv$pOq%EhU
z5ZGT+S-OBz*7Q`+o(jCLSb!nqa}S<8st==qA4ZPsoUA?^%XByjMq#KIlk<!T4o1V!
z=;G=GRKKTyoy8BSHy7R|``dA%;1$Tv?f6uE&Ab?P$SPc)cQ#~Qx);-QuMo106j?<*
zDa&U@v5L`TkzF*9HTmLNAx1|&wTV)aZ6w0HhwS_Uiw@Z}%ArvOWP(kUNurGvler0F
zX5w58Q=(C&8dWxubXY}+cz8?A+*o;E7CSS%Lwtl-?c#7U-oXOpR&gkq#i0ytl9@?5
zSRL5vA&qL*C^xxmVXgjRVW~fH)5%OytA;tMQEeJ^j5vAz5}sPh&1_~eJQ}85qx!>e
zz#4Bi1gbj?m~6I*`>=<6WffETCAj#-m|k8?omJG)$qw;!>WIxJjL2clvjDo^8#LfW
zhYlr?HDarAz87IMYetD9KWnxQ{rCbSa<N7nmGPM{j6Lw*;L3Ud8C112NC<egyA}s1
zS1qO~UyCOqlH-gamxiz>amKtkd6rP0*OJAn21YLb&etDDq8i2bzuYMuD&=yg<WJct
zHNO&ZzY_7h5^2{&hOml9G?5?{IXn=VX)m;P%WPD7ZZEuz<${Nb#AC&5;E$Yo_SPU|
z3P-5ou0j*OgLzn*(GukcTpJ=)z|^nMUEf1GmP@@Vu)bul!liyiqW$||B9_1HQi(HH
z2Z`197?HLgW??*@R2_h5DE@;*nhro1mMgERIaBJwk#3-`s6QET@*rem`N?%3@d0}h
z|BgW=E^uOWGpj0_o9?ScwiokH!pq@~-B;*ZH)LWt=SJdi|8!>W;B<>0DD=u<$i?za
z&jgjIwGK9a`=LU!et>8!r}s@$iMonGV$ySkE^UD{ELU}BtHk_UL24h@A1U-yE5u`Y
zySYRqS|1ry!u^**#Wt9Z<;E+^R07?JP>IEVD|Epz$iuSf=nfyj7gBw8aF%iZDD>=c
zwlQJ(Ok$vH%}*aI5^+(;C5aSP(3=!SV0q7zX7zx_CY^c!da6*#1B<ZS?K-a#V~!hD
z;v6HI+Ib5b%O9(Ry(&y48lNc?dm#bKzooqv?O*tXfMs>FWligZIKh<O_lA#n!N#~X
zL#N(rC2~pRK^H6|Rb8;0e%K9eEMCDb5`B`%8;zo8YOHgYWOEc`>CluT;TWlku3#^s
zlXUioMYxh|?G@w6)Lt>f?>m_vTj@`|+N(!MRps*{n4&CaQyN{Uhi*No&;yWXQJ|v<
z!(ggN$Hl?{OjF+k<4}5L6fBA%*_mLXTQVUjjFe_VD(T2&y1@zY;Ushw+j^`MbfkPX
z^FHQY3y=A{GVblp2RBhHkVEP$peOG!kG}N<%mLby3mb+1D?wS}yZFCJzgnO(h}<h;
zm9`XtolYud?=#mX@_a6sd2j-8Gmj>ez(oUD>4b1n=7fls4L)50V|ZI*$r2~)Bi{)U
z*;dUa$=C=UfgY-cO(DM9USLGXo^74ZF3k7sKy=qu=rEAgJ0O(C)WJG|6zzq|e*tc;
BAhiGh

delta 1941
zcmZWpeNa?Y6o2=fE3E9Y%ZH-uE(9VBN~nD~!bpi=qN45>8v?m%HA5<ChD|nNI;DW7
zpbMReo}_|_xH5~2Twui#ozZM;nu&>OM!`S)OvlQGQpd6TK;QE8{c+y;{oe0)?z!i_
z_bydLZr>VNog`i|wkGdQ6@zMhXHzdEkRqJgMc($^vz`}85#zayxTBm)NRe-?^Jl=y
zeI(N7EXbn6nP+K|IFx;QWf{A&jJWf~X@DPhl2>B2M0k7=!Jd_!sU<NShY6#FP~pCS
z7r4d%f>wyj-;yK<ans^5GTa;U>Ts){B#J!*J$`c9-M(}JZtf;i+&!+@ZhRPCt~*JX
z?xYy92mMws8;%wVL|!Lrkz=t&=)z13)TP|6B_qgNDs(4w<g+d`+QEd;cF?0%4i9ah
zPdUD2WYIPi@~O}<Y_@U#VeZ1O<giorA602QDs)7JnlWAWr^(h7ImF1J&jDuAf>#}o
zfc;ho!tbq|on-+H9<sui6j$`f{+6mxp$ZjXftA-^BKsG}A%lmMJe9_wLUt9h;Y|zo
z->`rl#%lyzVTXhA;3tz#dDKyu<A5sc<0pZ^4qo110}UIU2WMXx7o`gl?3UccRJhw4
z{5ady5rNmXL2E?&BYtS}UN5jO%3P=smY)y^HkU)}bM-rj5ID}SRcKwXh(DA=G;9#H
z3@V@_JT)OA<kwN$kPwmU%w4P-%DkD{r<mWb%HvAF>tDi~pGd~$p;tySKCwu~BhN6N
zXPC}sm@XAFN|1~#DkhjS!>^}goNLRotawonve^zlc++G0C8O2u$kYgFEn!4Z5L?e%
z@5lT>c!La}cMzuX+W^1C3_LMh?9~f`f?P%69LdT=X8jk6r?aw|bT+W#sq~DVeft`1
zBCKpKT|OSqEulKLCX<E);UyO}<D?Rr$_8C@YG{<)T;Fs-u*|V7kiS@Sm>gNjXLOf{
z3(M(zyt|Fs@J2ZgD2JUD!$E^sM#J#VCYp}@6;y+1l{6buDybf?RnTl!R!O^qag&=b
z*R-1^W2~D_MkmkMPrGRmk)LGCq>c5s=`RL6)j;F1x`9qYZ6lq4x2vcDZ#Ga9TT?=l
z!vd`^-i3ucy;}5U>ZF+3NX;zh5UmVha~f&4h*hnec<U6c67f|(pMkHHdJOpYX}X&E
z>mY}i&baD_&L^L5`n{EU{(l-C!8E7DVkIad#z)>U@{D9b{q{&jaEl9S_QDKe8q=)^
zDhdJ>bTtpc*|mCjo|p>1QxxYe1{CLH#gu(8kC+BdDT;d;@?Ubei<(-l*s~u(iI~`r
z`wzfaYWadwT?ZhGh;5hgQ3I!R$f@y-a-A9Wf0RNs`GG=GvBWkWgbZSG?3+CH$$pYg
z1om^iL}I<)z<dJ#txLi9CKwCF?@BDK38IK8r#?$DRV@qbVB$)Ntvn3ViK%)+wxU>m
zGg#TdpIqT@hD2g&yj-9tS_ch^!m~<Z501bbVrr@_RTRSQa79tPT4IGqA(xo07uF3a
zR`B_3IUi_#B5%H@h0nx1>#zMoiaxIRjelaA$CI3~Ml#|mFRaISFU)5HUKmGAs}FjV
z1@D_R%7Qc3N-W|SyhBW%=lrNB;*Uot3eEcx+vDRcLH_6mc)5*FtCv&v+8~LD-T{nn
vhbX9CC$aQ)m>>eJdI?<}{HRJxc^iLpKq-FI0Ut0|CwK_F{Go(;Ka~Ct0Tv+3

diff --git a/src/CWxScannerQuestScript.gek b/src/CWxScannerQuestScript.gek
index b9b09f3..b066744 100644
--- a/src/CWxScannerQuestScript.gek
+++ b/src/CWxScannerQuestScript.gek
@@ -21,7 +21,7 @@ begin GameMode
 			; As normal activation is temporarily disabled, we need to change it back to "Scan".
 
 
-			if GetUIFloat "HUDMainMenu\_DUIF3" > 0 ; DarnUI
+			if GetUIFloat "HUDMainMenu/_DUIF3" > 0 ; DarnUI
 
 				if eval GetUIString "HUDMainMenu/InfoWrap/Info/justify_center_hotrect/string" != "Scan"
 					SetUIString "HUDMainMenu/InfoWrap/Info/justify_center_hotrect/string" "Scan"
@@ -64,7 +64,7 @@ begin GameMode
 	; SetStage CWxScannerTextQuest 0
 
 	if rTarget == 0
-		if GetUIFloat "HUDMainMenu\_DUIF3" > 0 ; DarnUI
+		if GetUIFloat "HUDMainMenu/_DUIF3" > 0 ; DarnUI
 			if eval GetUIString "HUDMainMenu/InfoWrap/Info/justify_center_hotrect/string" == "Scan"
 				SetUIFloat "HUDMainMenu/InfoWrap/Info/justify_center_hotrect/visible" 0
 			endif
@@ -82,7 +82,7 @@ begin GameMode
 
 	set iControl to GetControl 5
 
-	if GetUIFloat "HUDMainMenu\_DUIF3" > 0 ; DarnUI
+	if GetUIFloat "HUDMainMenu/_DUIF3" > 0 ; DarnUI
 		SetUIStringEx "HUDMainMenu/InfoWrap/Info/justify_center_hotrect/_PCButtonText" "%k)" iControl
 		SetUIString "HUDMainMenu/InfoWrap/Info/justify_center_hotrect/string" "Scan"
 		SetUIFloat "HUDMainMenu/InfoWrap/Info/justify_center_hotrect/visible" 1
diff --git a/src/CWxScannerStop.gek b/src/CWxScannerStop.gek
index 31e6210..cbaf877 100644
--- a/src/CWxScannerStop.gek
+++ b/src/CWxScannerStop.gek
@@ -7,8 +7,14 @@ begin function {}
 	EnableControl 5
 
 	if GetActiveMenuMode == 0
-		if eval GetUIString "HUDMainMenu/Info/justify_center_hotrect/string" == "Scan"
-			SetUIFloat "HUDMainMenu/Info/justify_center_hotrect/visible" 0
+		if GetUIFloat "HUDMainMenu/_DUIF3" > 0 ; DarnUI
+			if eval GetUIString "HUDMainMenu/InfoWrap/Info/justify_center_hotrect/string" == "Scan"
+				SetUIFloat "HUDMainMenu/InfoWrap/Info/justify_center_hotrect/visible" 0
+			endif
+		else
+			if eval GetUIString "HUDMainMenu/Info/justify_center_hotrect/string" == "Scan"
+				SetUIFloat "HUDMainMenu/Info/justify_center_hotrect/visible" 0
+			endif
 		endif
 	endif