From ef4d09c5e2452bd1378205350052f0eb6622ea37 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Wed, 30 May 2018 10:21:07 -0700
Subject: [PATCH] Add app user-model IDs to Sandbox shortcut and use in
 server-console

---
 cmake/templates/NSIS.template.in | 6 ++++++
 server-console/src/main.js       | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 8c7479af48..4151a16e15 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -1174,8 +1174,14 @@ Section "-Core installation"
   !insertmacro MUI_STARTMENU_WRITE_END
 
   !if @PRODUCTION_BUILD@ == 1
+    ${If} @SERVER_COMPONENT_CONDITIONAL@
+      ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" "com.highfidelity.sandbox"
+    ${EndIf}
     ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@INTERFACE_SHORTCUT_NAME@.lnk" "com.highfidelity.interface"
   !else
+    ${If} @SERVER_COMPONENT_CONDITIONAL@
+      ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" "com.highfidelity.sandbox-dev"
+    ${EndIf}
     ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@INTERFACE_SHORTCUT_NAME@.lnk" "com.highfidelity.interface-dev"
   !endif
 
diff --git a/server-console/src/main.js b/server-console/src/main.js
index 498be966ed..b803c5e882 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -44,6 +44,8 @@ const LOG_FILE_REGEX = /(domain-server|ac-monitor|ac)-.*-std(out|err).txt/;
 
 const HOME_CONTENT_URL = "http://cdn.highfidelity.com/content-sets/home-tutorial-RC40.tar.gz";
 
+const APP_USER_MODEL_ID = 'com.highfidelity.sandbox';  // For Windows jump list, etc.
+
 function getBuildInfo() {
     var buildInfoPath = null;
 
@@ -867,7 +869,6 @@ function onContentLoaded() {
         } catch (e) {
         }
 
-        var appUserModelId = 'com.highfidelity.interface';  // For Windows jump list, etc.
         if (currentVersion !== null) {
             const CHECK_FOR_UPDATES_INTERVAL_SECONDS = 60 * 30;
             var hasShownUpdateNotification = false;
@@ -879,7 +880,7 @@ function onContentLoaded() {
                         title: 'An update is available!',
                         message: 'High Fidelity version ' + latestVersion + ' is available',
                         wait: true,
-                        appID: appUserModelId,
+                        appID: APP_USER_MODEL_ID,
                         url: url
                     });
                     hasShownUpdateNotification = true;