jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-24 02:13:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[Windows] Verify the force close and abort if the process survived

Browse source
This commit is contained in:
Lukas Brübach 2026-09-21 18:46:25 +02:00 • committed by GitHub
parent 20229825f0
commit e8d9158a53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cmake/NSIS.template.in
View file

@ -298,6 +298,15 @@ Function WaitForAppToClose
DetailPrint "Force closing $R1 ..." DetailPrint "Force closing $R1 ..."
Call ForceCloseMatchingApps Call ForceCloseMatchingApps
Sleep 500 Sleep 500
; verify the force close actually worked; a process that cannot be
; terminated (e.g. one owned by another user session) would otherwise
; leave locked files that silently reproduce the very mixed-Qt-DLL bug
; this guard exists to prevent.
Call IsAppRunning
${If} $R0 = 1
DetailPrint "WARNING: $R1 is still running; aborting before any files are replaced."
Abort
${EndIf}
${Else} ${Else}
ck_wait_prompt: ck_wait_prompt:
MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON1 \ MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON1 \
@ -387,6 +396,15 @@ Function un.WaitForAppToClose
DetailPrint "Force closing $R1 ..." DetailPrint "Force closing $R1 ..."
Call un.ForceCloseMatchingApps Call un.ForceCloseMatchingApps
Sleep 500 Sleep 500
; verify the force close actually worked; a process that cannot be
; terminated (e.g. one owned by another user session) would otherwise
; leave locked files that silently reproduce the very mixed-Qt-DLL bug
; this guard exists to prevent.
Call un.IsAppRunning
${If} $R0 = 1
DetailPrint "WARNING: $R1 is still running; aborting before any files are replaced."
Abort
${EndIf}
${Else} ${Else}
un_ck_wait_prompt: un_ck_wait_prompt:
MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON1 \ MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON1 \