PaperCutSoftware/GhostTrap
1
0
Fork 0
mirror of https://github.com/PaperCutSoftware/GhostTrap.git synced 2025-12-10 13:21:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

removing unused variable, also changing the default button to yes when asking user to confirm they would like to download dependencies now

Browse Source
This commit is contained in:
Leo Menzies-Ye 2024-02-07 15:49:28 +11:00
parent 83e75735b2
commit ca1125ffd9
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
installer/win/ghost-trap.iss
View File

@ -98,7 +98,6 @@ const
var var
HasRequiredVCRuntimeVersion : Boolean; HasRequiredVCRuntimeVersion : Boolean;
VCRuntimeMissingOptionsPage : TInputOptionWizardPage; VCRuntimeMissingOptionsPage : TInputOptionWizardPage;
IsInstallationFinishedNormally : Boolean;
ReadMoreLink : TLabel; ReadMoreLink : TLabel;
procedure ExitProcess(ExitCode : Integer); procedure ExitProcess(ExitCode : Integer);
@ -222,7 +221,7 @@ begin
if CurPageID = VCRuntimeMissingOptionsPage.ID then begin if CurPageID = VCRuntimeMissingOptionsPage.ID then begin
InstallNow := VCRuntimeMissingOptionsPage.Values[0]; InstallNow := VCRuntimeMissingOptionsPage.Values[0];
if InstallNow then begin if InstallNow then begin
if MsgBox('Would you like to install required dependencies now?', mbInformation, MB_YESNO or MB_DEFBUTTON2) = IDYES then begin if MsgBox('Would you like to install required dependencies now?', mbInformation, MB_YESNO or MB_DEFBUTTON1) = IDYES then begin
ShellExec('', 'https://aka.ms/vs/17/release/vc_redist.x64.exe', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode); ShellExec('', 'https://aka.ms/vs/17/release/vc_redist.x64.exe', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode);
ExitProcess(9); { Custom exit code } ExitProcess(9); { Custom exit code }
end; end;
@ -241,7 +240,6 @@ begin
HasRequiredVCRuntimeVersion := IsRequiredVCRuntimeVersionInstalled(); HasRequiredVCRuntimeVersion := IsRequiredVCRuntimeVersionInstalled();
{ If the OS is missing required dependencies, the installation process will not go the full length and will be aborted early } { If the OS is missing required dependencies, the installation process will not go the full length and will be aborted early }
if not HasRequiredVCRuntimeVersion then begin if not HasRequiredVCRuntimeVersion then begin
IsInstallationFinishedNormally := False;
VCRuntimeMissingOptionsPage := CreateInputOptionPage(wpLicense, VCRuntimeMissingOptionsPage := CreateInputOptionPage(wpLicense,
'Visual C++ Runtime Required', 'Visual C++ Runtime Required',
'You are seeing this page because required dependencies for GhostTrap are missing on your operating system.', 'You are seeing this page because required dependencies for GhostTrap are missing on your operating system.',
@ -252,9 +250,5 @@ begin
VCRuntimeMissingOptionsPage.Add('I will find the required dependencies myself later.'); VCRuntimeMissingOptionsPage.Add('I will find the required dependencies myself later.');
VCRuntimeMissingOptionsPage.Values[0] := True; VCRuntimeMissingOptionsPage.Values[0] := True;
CreateLink(); CreateLink();
end
{ If the OS has the required dependencies, completion of the installation is treated as normal }
else begin
IsInstallationFinishedNormally := True;
end; end;
end; end;