Installer: Fixed write error with new installs (when UAC is enabled)

This commit is contained in:
Birunthan Mohanathas 2012-05-10 22:31:55 +03:00
parent b7a3e03997
commit ba0f19b7e6

View File

@ -214,6 +214,7 @@ Function .onInit
StrCpy $Install64Bit $2 StrCpy $Install64Bit $2
StrCpy $NonDefaultLanguage $3 StrCpy $NonDefaultLanguage $3
StrCpy $LANGUAGE $4 StrCpy $LANGUAGE $4
StrCpy $INSTDIR $5
${EndIf} ${EndIf}
FunctionEnd FunctionEnd
@ -222,6 +223,7 @@ Function ExchangeSettings
StrCpy $2 $Install64Bit StrCpy $2 $Install64Bit
StrCpy $3 $NonDefaultLanguage StrCpy $3 $NonDefaultLanguage
StrCpy $4 $LANGUAGE StrCpy $4 $LANGUAGE
StrCpy $5 $INSTDIR
HideWindow HideWindow
FunctionEnd FunctionEnd
@ -681,6 +683,16 @@ SkipIniMove:
${EndIf} ${EndIf}
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
; Remove Rainmeter files mistakenly installed to root of Windows drive (old installer bug)
${GetRoot} "$WINDIR" $0
${If} ${FileExists} "$0\Rainmeter.exe"
${AndIfNot} ${FileExists} "$0\Plugins"
Delete "$0\Rainmeter.exe"
Delete "$0\Rainmeter.dll"
Delete "$0\SkinInstaller.exe"
${EndIf}
Delete "$INSTDIR\Rainmeter.exe.config" Delete "$INSTDIR\Rainmeter.exe.config"
Delete "$INSTDIR\Rainmeter.chm" Delete "$INSTDIR\Rainmeter.chm"
Delete "$INSTDIR\Default.ini" Delete "$INSTDIR\Default.ini"