From 52323025321162c7013012a42490c5d85d0d5154 Mon Sep 17 00:00:00 2001
From: Anthony Lavado <anthony@lavado.ca>
Date: Wed, 16 Oct 2019 02:29:37 -0400
Subject: [PATCH] Adds icons to shortcuts, fixes nsis warning

Adds the icon as a resource file in the program folder, and uses it for the shortcuts created.
Removes an extra section from the dialog creator file, so NSIS won't show a warning for unused code.
---
 deployment/windows/dialogs/setuptype.nsdinc |  6 ------
 deployment/windows/jellyfin.nsi             | 11 +++++++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/deployment/windows/dialogs/setuptype.nsdinc b/deployment/windows/dialogs/setuptype.nsdinc
index edc907ad0e..8746ad2cc6 100644
--- a/deployment/windows/dialogs/setuptype.nsdinc
+++ b/deployment/windows/dialogs/setuptype.nsdinc
@@ -48,9 +48,3 @@ Function fnc_setuptype_Create
   ${NSD_Check} $hCtl_setuptype_BasicInstall
   
 FunctionEnd
-
-; dialog show function
-Function fnc_setuptype_Show
-  Call fnc_setuptype_Create
-  nsDialogs::Show
-FunctionEnd
diff --git a/deployment/windows/jellyfin.nsi b/deployment/windows/jellyfin.nsi
index 55abaad74a..427dc7db99 100644
--- a/deployment/windows/jellyfin.nsi
+++ b/deployment/windows/jellyfin.nsi
@@ -163,7 +163,9 @@ Section "!Jellyfin Server (required)" InstallJellyfinServer
 
     SetOutPath "$INSTDIR"
 
+    CopyFiles /SILENT /FILESONLY "${UXPATH}\branding\NSIS\modern-install.ico" "$%InstallLocation%\icon.ico"
     File /r $%InstallLocation%\*
+    
 
 ; Write the InstallFolder, DataFolder, Network Service info into the registry for later use
     WriteRegExpandStr HKLM "${REG_CONFIG_KEY}" "InstallFolder" "$INSTDIR"
@@ -266,11 +268,12 @@ SectionEnd
 
 Section "Create Shortcuts" CreateWinShortcuts
     ${If} $_MAKESHORTCUTS_ == "Yes"
+        
         CreateDirectory "$SMPROGRAMS\Jellyfin Server"
-        CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin (View Console).lnk" "$INSTDIR\jellyfin.exe"
-        ;CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin Tray App.lnk" "$INSTDIR\jellyfin-tray.exe"
-        CreateShortCut "$DESKTOP\Jellyfin Server.lnk" "$INSTDIR\jellyfin.exe"
-        ;CreateShortCut "$DESKTOP\Jellyfin Server\Jellyfin Server.lnk" "$INSTDIR\jellyfin-tray.exe"
+        CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin (View Console).lnk" "$INSTDIR\jellyfin.exe" "" "$INSTDIR\icon.ico" 0
+        ;CreateShortCut "$SMPROGRAMS\Jellyfin Server\Jellyfin Tray App.lnk" "$INSTDIR\jellyfin-tray.exe" "" "$INSTDIR\icon.ico" 0
+        CreateShortCut "$DESKTOP\Jellyfin Server.lnk" "$INSTDIR\jellyfin.exe" "" "$INSTDIR\icon.ico" 0
+        ;CreateShortCut "$DESKTOP\Jellyfin Server\Jellyfin Server.lnk" "$INSTDIR\jellyfin-tray.exe" "" "$INSTDIR\icon.ico" 0
     ${EndIf}
 SectionEnd