From d6e03745485f34bc13b21cb056ed1590512cccd9 Mon Sep 17 00:00:00 2001 From: Martijn Laan Date: Sat, 6 Oct 2012 00:01:16 +0200 Subject: [PATCH] Fixed LoadInf support for /SuppressMsgBoxes and /NoCancel. --- Projects/Main.pas | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Projects/Main.pas b/Projects/Main.pas index 67569fd16..70795b8af 100644 --- a/Projects/Main.pas +++ b/Projects/Main.pas @@ -607,7 +607,7 @@ function SlashesToBackslashes(const S: String): String; Result[I] := '\'; end; -procedure LoadInf(const FileName: String); +procedure LoadInf(const FileName: String; var WantToSuppressMsgBoxes: Boolean); const Section = 'Setup'; var @@ -637,8 +637,10 @@ procedure LoadInf(const FileName: String); InitNoCloseApplications := GetIniBool(Section, 'NoCloseApplications', InitNoCloseApplications, FileName); InitRestartApplications := GetIniBool(Section, 'RestartApplications', InitRestartApplications, FileName); InitNoRestartApplications := GetIniBool(Section, 'NoRestartApplications', InitNoRestartApplications, FileName); + InitNoCancel := GetIniBool(Section, 'NoCancel', InitNoCancel, FileName); InitPassword := GetIniString(Section, 'Password', InitPassword, FileName); InitRestartExitCode := GetIniInt(Section, 'RestartExitCode', InitRestartExitCode, 0, 0, FileName); + WantToSuppressMsgBoxes := GetIniBool(Section, 'SuppressMsgBoxes', InitSuppressMsgBoxes, FileName); InitSaveInf := GetIniString(Section, 'SaveInf', InitSaveInf, FileName); end; @@ -2857,7 +2859,7 @@ procedure InitializeSetup; end; if InitLoadInf <> '' then - LoadInf(InitLoadInf); + LoadInf(InitLoadInf, WantToSuppressMsgBoxes); if WantToSuppressMsgBoxes and (InitSilent or InitVerySilent) then InitSuppressMsgBoxes := True;