From 0c5c73859e2e38836f11d24eb8120f1b585d9cc5 Mon Sep 17 00:00:00 2001 From: Nodir Temirkhodjaev Date: Thu, 25 Apr 2024 14:14:43 +0300 Subject: [PATCH] Installer: Rename "/AUTORUN" argument to "/LAUNCH" --- deploy/FortFirewall.iss | 6 +++--- deploy/out/FortFirewall-Silent.bat | 2 +- src/ui/manager/autoupdatemanager.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/FortFirewall.iss b/deploy/FortFirewall.iss index 767ff428..41494a13 100644 --- a/deploy/FortFirewall.iss +++ b/deploy/FortFirewall.iss @@ -97,7 +97,7 @@ Filename: "sc.exe"; Parameters: "start {#APP_SVC_NAME}"; Description: "Start ser Flags: nowait; Tasks: service Filename: "{#APP_EXE}"; Parameters: "--lang {code:LanguageName}"; \ - Description: {cm:LaunchProgram,{#APP_NAME}}; Flags: nowait postinstall; Check: IsAutoRun + Description: {cm:LaunchProgram,{#APP_NAME}}; Flags: nowait postinstall; Check: ShouldLaunch [UninstallRun] Filename: "{#APP_EXE}"; Parameters: "-u"; RunOnceId: "Uninstall" @@ -138,9 +138,9 @@ begin end; end; -function IsAutoRun: Boolean; +function ShouldLaunch: Boolean; begin - Result := ParamExists('/AUTORUN') or not (ParamExists('/SILENT') or ParamExists('/VERYSILENT')); + Result := ParamExists('/LAUNCH') or not (ParamExists('/SILENT') or ParamExists('/VERYSILENT')); end; #if CHECK_WIN10 == "Y" diff --git a/deploy/out/FortFirewall-Silent.bat b/deploy/out/FortFirewall-Silent.bat index 5f82e71c..993ba898 100644 --- a/deploy/out/FortFirewall-Silent.bat +++ b/deploy/out/FortFirewall-Silent.bat @@ -1 +1 @@ -@for %%f in (FortFirewall-*.exe) do @call .\%%f /SILENT /AUTORUN +@for %%f in (FortFirewall-*.exe) do @call .\%%f /SILENT /LAUNCH diff --git a/src/ui/manager/autoupdatemanager.cpp b/src/ui/manager/autoupdatemanager.cpp index f0a3a4f0..a1f78329 100644 --- a/src/ui/manager/autoupdatemanager.cpp +++ b/src/ui/manager/autoupdatemanager.cpp @@ -128,7 +128,7 @@ bool AutoUpdateManager::runInstaller() } if (!settings->hasService()) { - args << "/AUTORUN"; + args << "/LAUNCH"; } else { emit restartClients(); }