Merge branch 'disconnected-from-daemon-notification-on-suspend-des-723'

mullvad · Apr 2, 2024 · e4b2ada · e4b2ada
2 parents ad1ac09 + f1fa32d
commit e4b2ada
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
@@ -470,7 +470,7 @@ class ApplicationMain
     const wasConnected = this.daemonRpc.isConnected;
     IpcMainEventChannel.navigation.notifyReset?.();
     this.daemonRpc.disconnect();
-    this.onDaemonDisconnected(wasConnected);
+    this.onDaemonDisconnected(wasConnected, undefined, true);
   };
 
   private onResume = () => {
@@ -620,7 +620,7 @@ class ApplicationMain
     }
   };
 
-  private onDaemonDisconnected = (wasConnected: boolean, error?: Error) => {
+  private onDaemonDisconnected = (wasConnected: boolean, error?: Error, planned?: boolean) => {
     if (this.daemonEventListener) {
       this.daemonRpc.unsubscribeDaemonEventListener(this.daemonEventListener);
     }
@@ -631,7 +631,7 @@ class ApplicationMain
       SystemNotificationCategory.tunnelState,
     );
 
-    if (this.tunnelState.tunnelState.state !== 'disconnected') {
+    if (this.tunnelState.tunnelState.state !== 'disconnected' && !planned) {
       this.notificationController.notifyDaemonDisconnected(
         this.userInterface?.isWindowVisible() ?? false,
         this.settings.gui.enableSystemNotifications,