From beab291352e52faf54f43ba11e3d5df88e10df4b Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Wed, 15 Dec 2010 21:33:02 -0600
Subject: [PATCH] installer update; make the SMURL registry thing have its own
 switch

---
 sm-ssc.nsi          | 17 ++++++++++++++---
 src/ProductInfo.inc |  3 ++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/sm-ssc.nsi b/sm-ssc.nsi
index 936e906eb0..fcf4aadd2a 100644
--- a/sm-ssc.nsi
+++ b/sm-ssc.nsi
@@ -225,12 +225,13 @@ Section "Main Section" SecMain
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\smzipfile\DefaultIcon" "" "$INSTDIR\Program\StepMania.exe,1"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\smzipfile\shell\open\command" "" '"$INSTDIR\Program\StepMania.exe" "%1"'
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\.smzip" "" "smzipfile"
+!endif
 
-	; url protocol handler
+!ifdef ASSOCIATE_SMURL
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\stepmania" "" "StepMania protocol handler"
 	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\stepmania" "URL Protocol" ""
-	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\stepmania\DefaultIcon" "" "$INSTDIR\Program\${PRODUCT_FAMILY}.exe"
-	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\stepmania\shell\open\command" "" '"$INSTDIR\Program\${PRODUCT_FAMILY}.exe" "%1"'
+	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\stepmania\DefaultIcon" "" "$INSTDIR\Program\StepMania.exe"
+	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\stepmania\shell\open\command" "" '"$INSTDIR\Program\StepMania.exe" "%1"'
 !endif
 
 !ifdef INSTALL_NON_PCK_FILES
@@ -395,6 +396,9 @@ Section "Main Section" SecMain
 !ifdef ASSOCIATE_SMZIP
 	Call RefreshShellIcons
 !endif
+!ifdef ASSOCIATE_SMURL
+	Call RefreshShellIcons
+!endif
 !ifdef INSTALL_PROGRAM_LIBRARIES
 	; microsoft!
 	; xxx: how many of these do we really need?
@@ -680,6 +684,10 @@ Section "Uninstall"
 	DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Classes\.smzip"
 !endif
 
+!ifdef ASSOCIATE_SMURL
+	DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Classes\stepmania"
+!endif
+
 !ifdef INSTALL_NON_PCK_FILES
 	Delete "$INSTDIR\Announcers\instructions.txt"
 	RMDir "$INSTDIR\Announcers"
@@ -771,6 +779,9 @@ Section "Uninstall"
 !ifdef ASSOCIATE_SMZIP
 	Call un.RefreshShellIcons
 !endif
+!ifdef ASSOCIATE_SMURL
+	Call un.RefreshShellIcons
+!endif
 !ifdef INSTALL_PROGRAM_LIBRARIES
 	Delete "$INSTDIR\Program\mfc71.dll"
 	Delete "$INSTDIR\Program\msvcr71.dll"
diff --git a/src/ProductInfo.inc b/src/ProductInfo.inc
index 5be7ed1ddb..fbd6a80dbf 100644
--- a/src/ProductInfo.inc
+++ b/src/ProductInfo.inc
@@ -17,7 +17,8 @@
 !define INSTALL_PROGRAM_LIBRARIES
 !define INSTALL_EXECUTABLES
 !define INSTALL_NON_PCK_FILES
-;!define ASSOCIATE_SMZIP
+!define ASSOCIATE_SMZIP
+!define ASSOCIATE_SMURL
 ;!define SHOW_AUTORUN
 !define MAKE_OPEN_PROGRAM_FOLDER_SHORTCUT
 !define MAKE_OPEN_SETTINGS_FOLDER_SHORTCUT