mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 06:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Installer: Don't check service's running instance.

Browse Source 
Service'll be auto-stopped and started anyway.
This commit is contained in:
Nodir Temirkhodjaev 2021-05-15 11:45:13 +03:00
parent c9f2b8fd9e
commit fd9589a6ab
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deploy/FortFirewall.iss
View File

@ -15,7 +15,7 @@
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
SetupMutex=Global\{#APP_BASE}Setup SetupMutex=Global\{#APP_BASE}Setup
; TODO: Remove {#APP_NAME} from AppMutex after v4.1.0 ; 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} AppName={#APP_NAME}
AppVersion={#APP_VERSION_STR} AppVersion={#APP_VERSION_STR}
VersionInfoVersion={#APP_VERSION_STR} VersionInfoVersion={#APP_VERSION_STR}
@ -68,6 +68,7 @@ Name: "{commondesktop}\{#APP_NAME}"; Filename: "{#APP_EXE}"; WorkingDir: "{app}"
[Run] [Run]
Filename: "{app}\driver\scripts\reinstall.bat"; Description: "Re-install driver"; Flags: runascurrentuser 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"; \ 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; \ 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*.*" Type: files; Name: "{app}\README*.*"
[Code] [Code]
function InitializeSetup(): Boolean; function PrepareToInstall(var NeedsRestart: Boolean): String;
var var
ResultCode: Integer; ResultCode: Integer;
begin begin
if Exec('sc.exe', ExpandConstant('stop {#APP_SVC_NAME}'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then if Exec('sc.exe', ExpandConstant('stop {#APP_SVC_NAME}'), '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
if ResultCode = 0 then Sleep(100); // Let service to stop if ResultCode = 0 then Sleep(100); // Let service to stop
Result := True; Result := '';
end;
procedure DeinitializeSetup();
var
ResultCode: Integer;
begin
Exec('sc.exe', ExpandConstant('start {#APP_SVC_NAME}'), '', SW_HIDE, ewNoWait, ResultCode);
end; end;
function LanguageName(Param: String): String; function LanguageName(Param: String): String;

3
src/ui/fortmanager.cpp
View File

@ -77,7 +77,8 @@ FirewallConf *FortManager::conf() const
bool FortManager::checkRunningInstance() bool FortManager::checkRunningInstance()
{ {
bool isSingleInstance; bool isSingleInstance;
m_instanceMutex = OsUtil::createMutex(APP_BASE, isSingleInstance); m_instanceMutex = OsUtil::createMutex(
settings()->isService() ? "Global\\" APP_BASE : APP_BASE, isSingleInstance);
if (!isSingleInstance) { if (!isSingleInstance) {
showErrorBox(tr("Application is already running!")); showErrorBox(tr("Application is already running!"));