From 94932ea21614dc8ecb303b4fe44fbe4b120beae0 Mon Sep 17 00:00:00 2001 From: Anthony Lavado Date: Tue, 22 Oct 2019 04:33:06 -0400 Subject: [PATCH] Make installer shortcut check better During an upgrade, only create shortcuts if the existing install was not a service install. Otherwise, do not create them. --- deployment/windows/jellyfin.nsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deployment/windows/jellyfin.nsi b/deployment/windows/jellyfin.nsi index 1e3d255d67..f7ed78119a 100644 --- a/deployment/windows/jellyfin.nsi +++ b/deployment/windows/jellyfin.nsi @@ -402,6 +402,8 @@ Function .onInit StrCpy $_EXISTINGSERVICE_ "Yes" StrCpy $_INSTALLSERVICE_ "Yes" StrCpy $_SERVICESTART_ "Yes" + StrCpy $_MAKESHORTCUTS_ "No" + SectionSetText ${CreateWinShortcuts} "" NoService: ; existing install was present but no service was detected @@ -511,6 +513,7 @@ ${If} $BasicInstall == 1 ${Else} StrCpy $_SETUPTYPE_ "Advanced" StrCpy $_INSTALLSERVICE_ "Yes" + StrCpy $_MAKESHORTCUTS_ "No" ${If} $_FOLDEREXISTS_ == "Yes" MessageBox MB_OKCANCEL|MB_ICONINFORMATION "An existing data folder was detected.\ $\r$\nBasic Setup is highly recommended.\ @@ -520,6 +523,7 @@ ${Else} ${EndIf} GoAhead: StrCpy $_JELLYFINDATADIR_ "$%ProgramData%\Jellyfin\Server" + SectionSetText ${CreateWinShortcuts} "" ${EndIf} FunctionEnd