From c4c1fdc6db925f49365e1d4a9a903ef3a0da9f1b Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 11 Feb 2016 10:32:26 -0800
Subject: [PATCH] Fix server console not shutting down with new icons

---
 server-console/src/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server-console/src/main.js b/server-console/src/main.js
index 4e2451bc8e..e05106aa6f 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -134,7 +134,7 @@ function shutdownCallback(idx) {
             homeServer.stop();
         }
 
-        updateTrayMenu(null);
+        updateTrayMenu(homeServer.state);
 
         if (homeServer.state == ProcessGroupStates.STOPPED) {
             // if the home server is already down, take down the server console now
@@ -594,7 +594,7 @@ function updateMenuArray(menuArray, serverState) {
 
 function updateTrayMenu(serverState) {
     if (tray) {
-        var menuArray = buildMenuArray(serverState);
+        var menuArray = buildMenuArray(isShuttingDown ? null : serverState);
         tray.setImage(trayIcons[serverState]);
         tray.setContextMenu(Menu.buildFromTemplate(menuArray));
         if (isShuttingDown) {