diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-06-17 10:44:40 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-06-17 10:44:40 +0200 |
| commit | 6b7d8e65da4832c11313a02fbc500ff4bbe1a57c (patch) | |
| tree | e33839bf2aa8a794b73cb0e7c7336933f81ac925 | |
| parent | 3fa72148086744fc8ee4a9e0a33470ffd2b0dab9 (diff) | |
| parent | 12751b01f4278f8e1477de74b1f3cc41f7a9e4cf (diff) | |
| download | mullvadvpn-6b7d8e65da4832c11313a02fbc500ff4bbe1a57c.tar.xz mullvadvpn-6b7d8e65da4832c11313a02fbc500ff4bbe1a57c.zip | |
Merge branch 'disable-notification-action-on-windows'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | gui/src/main/notification-controller.ts | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 01e92e5791..b3137c4d30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,8 @@ Line wrap the file at 100 chars. Th #### Windows - Fix failure to restart the daemon when resuming from "fast startup" hibernation. +- Disable notification actions for persistent notifications since they were called when pressing + close. ## [2021.4-beta1] - 2021-06-09 diff --git a/gui/src/main/notification-controller.ts b/gui/src/main/notification-controller.ts index 17343837d4..80eb14364a 100644 --- a/gui/src/main/notification-controller.ts +++ b/gui/src/main/notification-controller.ts @@ -123,7 +123,7 @@ export default class NotificationController { notification.on('action', () => this.performAction(systemNotification.action)); } notification.on('click', () => this.notificationControllerDelegate.openApp()); - } else { + } else if (!(process.platform === 'win32' && systemNotification.critical)) { if (systemNotification.action) { notification.on('click', () => this.performAction(systemNotification.action)); } else { |