From 374b20ee34bd628ec9eac59a771001ac0aa5aaf9 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Tue, 26 Jun 2012 20:05:35 +0300
Subject: [PATCH] Fixed leftovers after uninstall

---
 Build/Installer/Installer.nsi | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Build/Installer/Installer.nsi b/Build/Installer/Installer.nsi
index 9f8ba18a..1140da88 100644
--- a/Build/Installer/Installer.nsi
+++ b/Build/Installer/Installer.nsi
@@ -50,6 +50,7 @@ SetCompressor /SOLID lzma
 RequestExecutionLevel user
 InstallDirRegKey HKLM "SOFTWARE\Rainmeter" ""
 ShowInstDetails nevershow
+AllowSkipFiles off
 XPStyle on
 OutFile "..\${OUTFILE}"
 ReserveFile "${NSISDIR}\Plugins\LangDLL.dll"
@@ -1022,16 +1023,15 @@ Section Uninstall
 	RMDir /r "$INSTDIR\Defaults"
 	RMDir /r "$INSTDIR\Languages"
 	RMDir /r "$INSTDIR\Plugins"
+	RMDir /r "$INSTDIR\Skins"
+	RMDir /r "$INSTDIR\Addons"
+	RMDir /r "$INSTDIR\Fonts"
 	Delete "$INSTDIR\Rainmeter.dll"
 	Delete "$INSTDIR\Rainmeter.exe"
 	Delete "$INSTDIR\SkinInstaller.exe"
-	RMDir "$INSTDIR"
+	Delete "$INSTDIR\uninst.exe"
 
-	${If} $un.DeleteAll == 1
-		RMDir /r "$INSTDIR\Skins"
-		RMDir /r "$INSTDIR\Addons"
-		RMDir /r "$INSTDIR\Fonts"
-	${EndIf}
+	RMDir "$INSTDIR"
 
 	SetShellVarContext all
 	RMDir /r "$APPDATA\Rainstaller"
@@ -1058,7 +1058,7 @@ Section Uninstall
 
 	DeleteRegKey HKLM "SOFTWARE\Rainmeter"
 	DeleteRegKey HKCR ".rmskin"
-	DeleteRegKey HKCR "Rainmeter skin"
+	DeleteRegKey HKCR "Rainmeter.SkinInstaller"
 	DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Rainmeter"
 	${RefreshShellIcons}
 SectionEnd