procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-02 17:03:26 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

build/windows: Set timeout for Restore Point creation

Browse source 
See: #13874

The process is managed by WMI so we need to
prevent stuckness that can happen in rare scenarios.
This commit is contained in:
Bruno Lopes 2025-05-09 04:00:38 -03:00
parent 1d5c3cbd43
commit 63d2e1f871
No known key found for this signature in database
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/windows/installer/base_gimp3264.iss
View file

@ -1173,7 +1173,7 @@ var
ResultCode: Integer;
begin
StatusLabel(CustomMessage('CreatingRestorePoint'),'');
if not ShellExec('RunAs', 'powershell', ExpandConstant('Checkpoint-Computer -Description "GIMP_{#CUSTOM_GIMP_VERSION}_install" -RestorePointType APPLICATION_INSTALL'),
if not ShellExec('RunAs', 'powershell', '-Command "$job = Start-Job -ScriptBlock { Checkpoint-Computer -Description "GIMP_' + ExpandConstant('{#CUSTOM_GIMP_VERSION}') + '_install" -RestorePointType APPLICATION_INSTALL }; Wait-Job $job -Timeout 24; if ($job.State -eq \"Running\") { Stop-Job $job -Confirm:$false }; Receive-Job $job"',
'', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
begin
DebugMsg('RestorePoint','Failed to create restore point. Error code: ' + IntToStr(ResultCode));

2
build/windows/installer/util_uninst.isi
View file

@ -266,7 +266,7 @@ var
ResultCode: Integer;
begin
UninstallProgressForm.StatusLabel.Caption := CustomMessage('CreatingRestorePoint');
if not ShellExec('RunAs', 'powershell', ExpandConstant('Checkpoint-Computer -Description "GIMP_{#CUSTOM_GIMP_VERSION}_uninstall" -RestorePointType APPLICATION_UNINSTALL'),
if not ShellExec('RunAs', 'powershell', '-Command "$job = Start-Job -ScriptBlock { Checkpoint-Computer -Description "GIMP_' + ExpandConstant('{#CUSTOM_GIMP_VERSION}') + '_uninstall" -RestorePointType APPLICATION_UNINSTALL }; Wait-Job $job -Timeout 24; if ($job.State -eq \"Running\") { Stop-Job $job -Confirm:$false }; Receive-Job $job"',
'', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
begin
DebugMsg('RestorePointU','Failed to create restore point. Error code: ' + IntToStr(ResultCode));