Fixed LoadInf support for /SuppressMsgBoxes and /NoCancel.

jrsoftware · Oct 5, 2012 · d6e0374 · d6e0374
1 parent d5492c8
commit d6e0374
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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;