aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

There is no conflict on Windows.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-01-11 13:47:56 +02:00
parent 225db2efc6
commit 334983bc6e
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/win/inno/valentina.iss vendored
View File

@ -11,7 +11,6 @@
; Appstatus: "" = release, "b" = beta, "a" = alpha ; Appstatus: "" = release, "b" = beta, "a" = alpha
; this only modifies the resulting exe name of the installer package ;-) ; this only modifies the resulting exe name of the installer package ;-)
#define MyAppStatus "a" #define MyAppStatus "a"
#define ConflictingAppId "{7081AEC7-38FC-479F-B712-DB073BB76513}"
[Setup] [Setup]
; NOTE: The value of AppId uniquely identifies this application. ; NOTE: The value of AppId uniquely identifies this application.
@ -417,13 +416,6 @@ var
InstallationCanceledMessage : String; InstallationCanceledMessage : String;
begin begin
if RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{#ConflictingAppId}_is1') or
RegKeyExists(HKEY_CURRENT_USER, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{#ConflictingAppId}_is1') then
begin
MsgBox('Detected conflicting application. Please, uninstall Seamly2D before proceeding installation.', mbError, MB_OK);
Result := False;
end
else begin
// Create a mutex for the installer and if it's already running then show a message and stop installation // Create a mutex for the installer and if it's already running then show a message and stop installation
if CheckForMutexes(installer_mutex_name) then begin if CheckForMutexes(installer_mutex_name) then begin
SuppressibleMsgBox(ExpandConstant('{cm:SetupIsRunningWarning}'), mbError, MB_OK, MB_OK); SuppressibleMsgBox(ExpandConstant('{cm:SetupIsRunningWarning}'), mbError, MB_OK, MB_OK);
@ -450,7 +442,6 @@ var
end; end;
end; end;
end; end;
end;
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// Run on uninstall // Run on uninstall