mirror of https://github.com/odrling/Aegisub
fix stupidity in previous commit
Originally committed to SVN as r749.
This commit is contained in:
parent
241a837e44
commit
7652879aad
|
@ -107,7 +107,7 @@ var
|
||||||
InstalledVersion: string;
|
InstalledVersion: string;
|
||||||
ReturnCode: Integer;
|
ReturnCode: Integer;
|
||||||
VersionMS, VersionLS: Cardinal;
|
VersionMS, VersionLS: Cardinal;
|
||||||
OverwriteInstall: Integer;
|
UninstallOld: Integer;
|
||||||
begin
|
begin
|
||||||
Result := GetVersionNumbers(AddBackslash(ExpandConstant('{sys}')) + 'avisynth.dll', VersionMS , VersionLS);
|
Result := GetVersionNumbers(AddBackslash(ExpandConstant('{sys}')) + 'avisynth.dll', VersionMS , VersionLS);
|
||||||
if Result then
|
if Result then
|
||||||
|
@ -123,15 +123,10 @@ begin
|
||||||
|
|
||||||
if RegQueryStringValue(HKLM, 'SOFTWARE\Aegisub\info', 'InstallDir', InstallDir) and RegQueryStringValue(HKLM, 'SOFTWARE\Aegisub\info', 'InstVer', InstalledVersion) and FileExists(AddBackslash(InstallDir) + 'uninstall.exe') then
|
if RegQueryStringValue(HKLM, 'SOFTWARE\Aegisub\info', 'InstallDir', InstallDir) and RegQueryStringValue(HKLM, 'SOFTWARE\Aegisub\info', 'InstVer', InstalledVersion) and FileExists(AddBackslash(InstallDir) + 'uninstall.exe') then
|
||||||
begin
|
begin
|
||||||
OverwriteInstall := MsgBox('A previous Aegisub install has been detected (Version ' + InstalledVersion + ').'#13#10'Due to changes from the old installer you are strongly encouraged to uninstall it first.'#13#10'Uninstall it before proceeding?', mbConfirmation, MB_YESNOCANCEL);
|
UninstallOld := MsgBox('A previous Aegisub install has been detected (Version ' + InstalledVersion + ').'#13#10'Due to changes from the old installer you are strongly encouraged to uninstall it first.'#13#10'Uninstall it before proceeding?', mbConfirmation, MB_YESNOCANCEL);
|
||||||
if OverwriteInstall = IDCANCEL then
|
if UninstallOld = IDCANCEL then
|
||||||
begin
|
Result := False
|
||||||
Result := False;
|
else if UninstallOld = IDYES then
|
||||||
Exit;
|
|
||||||
end
|
|
||||||
else if OverwriteInstall = IDNO then
|
|
||||||
Exit
|
|
||||||
else if OverwriteInstall = IDYES then
|
|
||||||
if FileCopy(AddBackslash(InstallDir) + 'uninstall.exe', AddBackslash(ExpandConstant('{tmp}')) + 'aegisub-uninstall.exe', False) then
|
if FileCopy(AddBackslash(InstallDir) + 'uninstall.exe', AddBackslash(ExpandConstant('{tmp}')) + 'aegisub-uninstall.exe', False) then
|
||||||
begin
|
begin
|
||||||
Exec(AddBackslash(ExpandConstant('{tmp}')) + 'aegisub-uninstall.exe', '_?=' + InstallDir, InstallDir, SW_SHOW, ewWaitUntilTerminated, ReturnCode);
|
Exec(AddBackslash(ExpandConstant('{tmp}')) + 'aegisub-uninstall.exe', '_?=' + InstallDir, InstallDir, SW_SHOW, ewWaitUntilTerminated, ReturnCode);
|
||||||
|
|
Loading…
Reference in New Issue