From f3f0f84db1058e7648c4768d326b0ffe5f9ad8ee Mon Sep 17 00:00:00 2001
From: Martin <git@martinbrook.com>
Date: Thu, 29 Sep 2016 10:34:01 +0100
Subject: [PATCH 1/2] Fix the minimise to tray option never being enabled on
 Linux

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index 0bf7c3b5..19ea3446 100644
--- a/src/main.js
+++ b/src/main.js
@@ -407,7 +407,7 @@ app.on('ready', function() {
     if (shouldShowTrayIcon()) {
       const tray_menu = require('./main/menus/tray').createMenu(mainWindow, config);
       trayIcon.setContextMenu(tray_menu);
-      if (process.platform === 'darwin') {
+      if (process.platform === 'darwin' || process.platform === 'linux') {
         // store the information, if the tray was initialized, for checking in the settings, if the application
         // was restarted after setting "Show icon on menu bar"
         if (trayIcon)

From c078d1f607347cfa313098e7d3c8bf11eb842b1a Mon Sep 17 00:00:00 2001
From: Martin <git@martinbrook.com>
Date: Thu, 29 Sep 2016 10:34:51 +0100
Subject: [PATCH 2/2] Use correct terminology for tray setting on Linux

---
 src/browser/settings.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index e489b209..f039cb69 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -168,7 +168,7 @@ var SettingsPage = React.createClass({
                      onChange={ this.handleChangeHideMenuBar } />);
     }
     if (process.platform === 'darwin' || process.platform === 'linux') {
-      options.push(<Input key="inputShowTrayIcon" id="inputShowTrayIcon" ref="showTrayIcon" type="checkbox" label="Show icon on menu bar (Need to restart the application)" checked={ this.state.showTrayIcon }
+      options.push(<Input key="inputShowTrayIcon" id="inputShowTrayIcon" ref="showTrayIcon" type="checkbox" label={ process.platform === 'darwin' ? "Show icon on menu bar (need to restart the application)" : "Show icon in notification area (need to restart the application)" } checked={ this.state.showTrayIcon }
                      onChange={ this.handleChangeShowTrayIcon } />);
     }
     if (process.platform === 'linux') {