From 3cf2c21c7b6e81ccd2567ade9b752e8669637764 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 19 Oct 2013 12:26:33 +0300
Subject: [PATCH] Installer: Minor tweaks

---
 Build/Installer/Installer.nsi | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/Build/Installer/Installer.nsi b/Build/Installer/Installer.nsi
index b1a45991..88f844d7 100644
--- a/Build/Installer/Installer.nsi
+++ b/Build/Installer/Installer.nsi
@@ -669,15 +669,6 @@ SkipIniMove:
 
 	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}
-
 	; Cleanup old stuff
 	Delete "$INSTDIR\Rainmeter.chm"
 	Delete "$INSTDIR\Default.ini"
@@ -706,12 +697,13 @@ SkipIniMove:
 	${EndIf}
 
 !ifdef INCLUDEFILES
+	File "..\..\Application\Rainmeter.exe.config"
+
 	${If} $instArc == "x86"
 		!insertmacro InstallFiles "x32"
 	${Else}
 		!insertmacro InstallFiles "x64"
 	${EndIf}
-	File "..\..\Application\Rainmeter.exe.config"
 
 	RMDir /r "$INSTDIR\Languages"
 	SetOutPath "$INSTDIR\Languages"