From 75b178b1ffa690d9b0dba2eb1121d41294e415e7 Mon Sep 17 00:00:00 2001
From: Rémi Weislinger <closingin@protonmail.com>
Date: Thu, 15 Feb 2018 13:38:25 -0500
Subject: Fix bug with notifications click changing window's state Issue #645

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

(limited to 'src/stores/AppStore.js')

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 06c43f83f..e70ad16ef 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -181,7 +181,7 @@ export default class AppStore extends Store {
 
         if (!isMac) {
           const mainWindow = remote.getCurrentWindow();
-          mainWindow.restore();
+          mainWindow.show();
         }
       }
     };
-- 
cgit v1.2.3-70-g09d2


From 3960288e02e9f501de26ba6a4d685c30eef7b898 Mon Sep 17 00:00:00 2001
From: Rémi Weislinger <closingin@protonmail.com>
Date: Thu, 15 Feb 2018 15:36:30 -0500
Subject: Restore windows behavior for notifications and add linux support
 Issue #645

---
 src/stores/AppStore.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/stores/AppStore.js')

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index e70ad16ef..a51a3267f 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -9,7 +9,7 @@ import prettyBytes from 'pretty-bytes';
 import Store from './lib/Store';
 import Request from './lib/Request';
 import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
-import { isMac } from '../environment';
+import { isMac, isLinux, isWindows } from '../environment';
 import locales from '../i18n/translations';
 import { gaEvent } from '../lib/analytics';
 
@@ -179,8 +179,11 @@ export default class AppStore extends Store {
 
         this.actions.service.setActive({ serviceId });
 
-        if (!isMac) {
-          const mainWindow = remote.getCurrentWindow();
+        const mainWindow = remote.getCurrentWindow();
+
+        if (isWindows) {
+          mainWindow.restore();
+        } else if (isLinux) {
           mainWindow.show();
         }
       }
-- 
cgit v1.2.3-70-g09d2