From 92388949fd41d7c52392a1a4ab1c0482616b89d6 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 18 Jan 2016 14:28:21 -0800 Subject: [PATCH] return to png tray icon for win/linux --- console/src/main.js | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/console/src/main.js b/console/src/main.js index 476155b19f..fbb627f13a 100644 --- a/console/src/main.js +++ b/console/src/main.js @@ -504,6 +504,9 @@ function detectExistingStackManagerResources() { return false; } +const trayFilename = (osType == "Darwin" ? "console-tray-Template.png" : "console-tray.png"); +const trayIcon = path.join(__dirname, '../resources/' + TRAY_FILENAME); + // This method will be called when Electron has finished // initialization and is ready to create browser windows. app.on('ready', function() { @@ -513,18 +516,6 @@ app.on('ready', function() { app.dock.hide(); } - var trayFilename = null; - - if (osType == "Darwin") { - trayFilename = "console-tray-Template.png"; - } else if (osType == "Windows_NT") { - trayFilename = "console-tray.ico"; - } else { - trayFilename = "console-tray.png"; - } - - const trayIcon = path.join(__dirname, '../resources/' + trayFilename); - // Create tray icon tray = new Tray(trayIcon); tray.setToolTip('High Fidelity Server Console');