From 16fc9f523fa5c969e1bab6605d78dd658ae0bcec Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Sun, 21 Oct 2012 20:28:44 +0200
Subject: [PATCH] Updated installer script.

---
 etc/NSIS/setup.nsi | 20 +++++++++++++++-----
 src/Config.h       |  4 ++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index 069d9c93..348cf4b2 100644
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -465,7 +465,11 @@ Section "-Create Shortcuts"
 		Delete "$SMPROGRAMS\$StartMenuFolder\*.pif"
 		Delete "$SMPROGRAMS\$StartMenuFolder\*.url"
 
-		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\LameXP.lnk" "$INSTDIR\LameXP.exe" "" "$INSTDIR\LameXP.exe" 0
+		!insertmacro GetExecutableName $R0
+		${StdUtils.ExecShellAsUser} $R1 "$INSTDIR" "$R0" ${StdUtils.Const.ISV_PinToTaskbar}
+		DetailPrint 'Pin to Taskbar: "$INSTDIR\$R0" -> $R1'
+		
+		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\LameXP.lnk" "$INSTDIR\$R0" "" "$INSTDIR\$R0" 0
 		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_LICENSE).lnk" "$INSTDIR\License.txt"
 		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_CHANGELOG).lnk" "$INSTDIR\Changelog.html"
 		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(LAMEXP_LANG_LINK_TRANSLATE).lnk" "$INSTDIR\Translate.html"
@@ -482,7 +486,9 @@ SectionEnd
 
 Section "-Update Registry"
 	!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_REGISTRY)"
+	!insertmacro GetExecutableName $R0
 	WriteRegStr HKLM "${MyRegPath}" "InstallLocation" "$INSTDIR"
+	WriteRegStr HKLM "${MyRegPath}" "ExecutableName" "$R0"
 	WriteRegStr HKLM "${MyRegPath}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
 	WriteRegStr HKLM "${MyRegPath}" "DisplayName" "LameXP"
 SectionEnd
@@ -495,10 +501,8 @@ Section "-Finished"
 		${StdUtils.ExecShellAsUser} $R1 "$INSTDIR\PRE_RELEASE_INFO.txt" "open" ""
 	${EndIf}
 !endif
-
-	; ---- POLL ----
-	; !insertmacro UAC_AsUser_ExecShell "" "http://mulder.brhack.net/temp/style_poll/" "" "" SW_SHOWNORMAL
-	; ---- POLL ----
+	
+	DetailPrint "Almost there..."
 SectionEnd
 
 
@@ -510,7 +514,13 @@ Section "Uninstall"
 	SetOutPath "$INSTDIR"
 	!insertmacro PrintProgress "$(LAMEXP_LANG_STATUS_UNINSTALL)"
 
+	ReadRegStr $R0 HKLM "${MyRegPath}" "ExecutableName"
+	${IfThen} "$R0" == "" ${|} StrCpy $R0 "LameXP.exe" ${|}
+	${StdUtils.ExecShellAsUser} $R1 "$INSTDIR" "$R0" ${StdUtils.Const.ISV_UnpinFromTaskbar}
+	DetailPrint 'Unpin from Taskbar: "$INSTDIR\$R0" -> $R1'
+	
 	Delete /REBOOTOK "$INSTDIR\LameXP.exe"
+	Delete /REBOOTOK "$INSTDIR\$R0"
 	Delete /REBOOTOK "$INSTDIR\LameXP-Portable.exe"
 	Delete /REBOOTOK "$INSTDIR\LameXP.exe.sig"
 	Delete /REBOOTOK "$INSTDIR\LameXP*"
diff --git a/src/Config.h b/src/Config.h
index 9e4bcff8..a58b1f3d 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -29,8 +29,8 @@
 #define VER_LAMEXP_MINOR_HI					0
 #define VER_LAMEXP_MINOR_LO					6
 #define VER_LAMEXP_TYPE						RC
-#define VER_LAMEXP_PATCH					1
-#define VER_LAMEXP_BUILD					1154
+#define VER_LAMEXP_PATCH					2
+#define VER_LAMEXP_BUILD					1156
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)