Merge pull request #157 from hsorby/main

Add displayicon key to windows registry when installing.

Author: hsorby

res/win/nsis.nsi

@@ -4,7 +4,7 @@
 ; You must define these values
 
   !define APP_NAME "MAP-Client"
-  !define APP_VERSION "0.14.0"
+  !define APP_VERSION "0.25.0"
   !define APP_ORGANISATION "MAP"
   !define VERSION "1.0.0"
   !define PATCH  "1"
@@ -742,7 +742,7 @@ Section "-Core installation"
 
   ; Optional registration
   Push "DisplayIcon"
-  Push "$INSTDIR\"
+  Push "$INSTDIR\${APP_NAME},0"
   Call ConditionalAddToRegisty
   Push "HelpLink"
   Push ""

res/win/nsis.nsi.template

@@ -119,7 +119,8 @@ Section
 
     ; Write uninstall information to registry.
     !insertmacro WriteUninstallInfo "DisplayName" "${APP_NAME} ${APP_VERSION}"
-    !insertmacro WriteUninstallInfo "DisplayVersion" "${INSTALLER_VERSION}"
+    !insertmacro WriteUninstallInfo "DisplayIcon" "$INSTDIR\${APP_NAME}.exe,0"
+    !insertmacro WriteUninstallInfo "DisplayVersion" "${APP_VERSION}"
     !insertmacro WriteUninstallInfo "Publisher" "${APP_ORGANISATION}"
     !insertmacro WriteUninstallInfo "UninstallString" "$INSTDIR\Uninstall.exe"
     !insertmacro WriteUninstallInfo "NoRepair" "1"