Merge branch 'hide-notifications-when-window-is-active'

2 files changed, 7 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38c14687b5..f5bf5c6012 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,7 @@ Line wrap the file at 100 chars.                                              Th
   session.
 - Account token can be copied to the clipboard by clicking on it in the account settings screen.
 - Automatically scroll to selected country/city in locations view.
-- Show system notifications when connection state changes.
+- Show system notifications when connection state changes and the window is not visible.
 - Add launch view displayed when connecting to system service.
 
 ### Changed
diff --git a/app/notification-controller.js b/app/notification-controller.js
index ff2c80db50..1d6138d404 100644
--- a/app/notification-controller.js
+++ b/app/notification-controller.js
@@ -7,6 +7,12 @@ export default class NotificationController {
 
   show(message: string) {
     const lastNotification = this._activeNotification;
+    const sameAsLastNotification = lastNotification && lastNotification.body === message;
+
+    if (sameAsLastNotification || remote.getCurrentWindow().isVisible()) {
+      return;
+    }
+
     const newNotification = new Notification(remote.app.getName(), { body: message, silent: true });
 
     this._activeNotification = newNotification;