From 3441c390bdd1300a7c4c378086388ca84ab57b5b Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sat, 7 Aug 2021 08:05:01 +0200 Subject: [PATCH] Setup: Fix crash if ROM was present. --- inno_setup_38.iss | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/inno_setup_38.iss b/inno_setup_38.iss index 287074b0..e1512178 100644 --- a/inno_setup_38.iss +++ b/inno_setup_38.iss @@ -127,7 +127,8 @@ end; var ROMFilePage: TInputFileWizardPage; var R : longint; var rom: string; -procedure InitializeWizard(); + +procedure AddRomPage(); begin rom := FileSearch('Zelda no Densetsu - Kamigami no Triforce (Japan).sfc', WizardDirValue()); if Length(rom) > 0 then @@ -152,13 +153,19 @@ begin ROMFilePage.Add( 'Location of ROM file:', 'SNES ROM files|*.sfc|All files|*.*', - '.sfc'); + '.sfc'); end; +procedure InitializeWizard(); +begin + AddRomPage(); +end; + + function ShouldSkipPage(PageID: Integer): Boolean; begin Result := False; - if PageID = ROMFilePage.ID then + if (assigned(ROMFilePage)) and (PageID = ROMFilePage.ID) then Result := not (WizardIsComponentSelected('client/lttp') or WizardIsComponentSelected('generator')); end;