From fd9589a6ab7b2c97f4525bfb650a161486d74ff8 Mon Sep 17 00:00:00 2001
From: Nodir Temirkhodjaev <nodir.temir@gmail.com>
Date: Sat, 15 May 2021 11:45:13 +0300
Subject: [PATCH] Installer: Don't check service's running instance.

Service'll be auto-stopped and started anyway.
---
 deploy/FortFirewall.iss | 14 ++++----------
 src/ui/fortmanager.cpp  |  3 ++-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/deploy/FortFirewall.iss b/deploy/FortFirewall.iss
index 2dec3249..15f544c9 100644
--- a/deploy/FortFirewall.iss
+++ b/deploy/FortFirewall.iss
@@ -15,7 +15,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 SetupMutex=Global\{#APP_BASE}Setup
 ; TODO: Remove {#APP_NAME} from AppMutex after v4.1.0
-AppMutex={#APP_NAME},{#APP_BASE},Global\{#APP_BASE}
+AppMutex={#APP_NAME},{#APP_BASE}
 AppName={#APP_NAME}
 AppVersion={#APP_VERSION_STR}
 VersionInfoVersion={#APP_VERSION_STR}
@@ -68,6 +68,7 @@ Name: "{commondesktop}\{#APP_NAME}"; Filename: "{#APP_EXE}"; WorkingDir: "{app}"
 
 [Run]
 Filename: "{app}\driver\scripts\reinstall.bat"; Description: "Re-install driver"; Flags: runascurrentuser
+Filename: "sc.exe"; Parameters: "start {#APP_SVC_NAME}"; Description: "Start service"; Flags: runascurrentuser nowait
 
 Filename: "https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads"; \
   Description: "Install the latest Visual C++ x86 redistributable!"; Flags: shellexec postinstall; \
@@ -86,20 +87,13 @@ Type: files; Name: "{app}\qt*.*"
 Type: files; Name: "{app}\README*.*"
 
 [Code]
-function InitializeSetup(): Boolean;
+function PrepareToInstall(var NeedsRestart: Boolean): String;
 var
   ResultCode: Integer;
 begin
   if Exec('sc.exe', ExpandConstant('stop {#APP_SVC_NAME}'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
     if ResultCode = 0 then Sleep(100); // Let service to stop
-  Result := True;
-end;
-
-procedure DeinitializeSetup();
-var
-  ResultCode: Integer;
-begin
-  Exec('sc.exe', ExpandConstant('start {#APP_SVC_NAME}'), '', SW_HIDE, ewNoWait, ResultCode);
+  Result := '';
 end;
 
 function LanguageName(Param: String): String;
diff --git a/src/ui/fortmanager.cpp b/src/ui/fortmanager.cpp
index 760a1edd..20165f70 100644
--- a/src/ui/fortmanager.cpp
+++ b/src/ui/fortmanager.cpp
@@ -77,7 +77,8 @@ FirewallConf *FortManager::conf() const
 bool FortManager::checkRunningInstance()
 {
     bool isSingleInstance;
-    m_instanceMutex = OsUtil::createMutex(APP_BASE, isSingleInstance);
+    m_instanceMutex = OsUtil::createMutex(
+            settings()->isService() ? "Global\\" APP_BASE : APP_BASE, isSingleInstance);
 
     if (!isSingleInstance) {
         showErrorBox(tr("Application is already running!"));