Merge branch 'fix-missing-notifications'

3 files changed, 11 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41439129c5..86b20c7df1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,8 @@ Line wrap the file at 100 chars.                                              Th
 - Fix the potential reconnect loop in GUI, triggered by the timeout when receiving
   the initial state of the daemon.
 - Fix the bug which caused the account token history to remain stale after logout.
+- Fix some notifications not appearing depending on how the window is shown and hidden while the
+  tunnel state changes.
 
 #### Linux
 - Fix startup failure when network device with a hardware address that's not a MAC address is
diff --git a/gui/packages/desktop/src/main/index.ts b/gui/packages/desktop/src/main/index.ts
index c017e1e61c..14f4186ee3 100644
--- a/gui/packages/desktop/src/main/index.ts
+++ b/gui/packages/desktop/src/main/index.ts
@@ -762,6 +762,11 @@ class ApplicationMain {
 
       windowController.send('window-shown');
     });
+
+    windowController.window.on('hide', () => {
+      // ensure notification guard is reset
+      this.notificationController.resetTunnelStateAnnouncements();
+    });
   }
 
   private registerIpcListeners() {
diff --git a/gui/packages/desktop/src/main/notification-controller.ts b/gui/packages/desktop/src/main/notification-controller.ts
index e1df2823b8..35314aa73a 100644
--- a/gui/packages/desktop/src/main/notification-controller.ts
+++ b/gui/packages/desktop/src/main/notification-controller.ts
@@ -113,6 +113,10 @@ export default class NotificationController {
     }
   }
 
+  public resetTunnelStateAnnouncements() {
+    this.lastTunnelStateAnnouncement = undefined;
+  }
+
   private showTunnelStateNotification(message: string) {
     const lastAnnouncement = this.lastTunnelStateAnnouncement;
     const sameAsLastNotification = lastAnnouncement && lastAnnouncement.body === message;