|
153 | 153 | begin |
154 | 154 | sUnInstRegKey := 'Software\Microsoft\Windows\CurrentVersion\Uninstall\{#MyAppName}{#CheckOldInstallerVersion}_is1'; |
155 | 155 | sUnInstPath := ''; |
156 | | - if not RegQueryStringValue(HKLM, sUnInstRegKey, 'UninstallString', sUnInstPath) then |
157 | | - RegQueryStringValue(HKCU, sUnInstRegKey, 'UninstallString', sUnInstPath); |
| 156 | + RegQueryStringValue(HKA, sUnInstRegKey, 'UninstallString', sUnInstPath); |
158 | 157 | Result := sUnInstPath; |
159 | 158 | end; |
160 | 159 |
|
@@ -188,18 +187,18 @@ function CheckPgAdminAlreadyInstalled: Boolean; |
188 | 187 | var |
189 | 188 | Version: String; |
190 | 189 | begin |
191 | | - if RegKeyExists(HKEY_LOCAL_MACHINE,'Software\{#MyAppName}\{#CheckOldInstallerVersion}') then |
| 190 | + if RegKeyExists(HKA,'Software\{#MyAppName}\{#CheckOldInstallerVersion}') then |
192 | 191 | begin |
193 | 192 | if UnInstallOldVersion() < 3 then |
194 | 193 | begin |
195 | 194 | Result := False; |
196 | 195 | end; |
197 | 196 | end; |
198 | 197 |
|
199 | | - if RegValueExists(HKEY_LOCAL_MACHINE,'Software\{#MyAppName}', 'Version') then |
| 198 | + if RegValueExists(HKA,'Software\{#MyAppName}', 'Version') then |
200 | 199 | begin |
201 | 200 | UpgradeMode := True; |
202 | | - RegQueryStringValue(HKEY_LOCAL_MACHINE,'Software\{#MyAppName}', 'Version', Version); |
| 201 | + RegQueryStringValue(HKA,'Software\{#MyAppName}', 'Version', Version); |
203 | 202 | if CompareVersions(Version, '{#MyAppFullVersion}') = 1 then |
204 | 203 | begin |
205 | 204 | MsgBox(ExpandConstant('{cm:NewerVersionExists}' + '(v' + Version + ') is already installed' ), mbInformation, MB_OK); |
|
0 commit comments