From 8d9c8b7799f117bebabe43c39971292f5033234c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= <zoltan.pmail@gmail.com>
Date: Fri, 24 Jul 2026 10:39:12 +0200
Subject: [PATCH] [client] Exit GUI immediately on Windows session end

Wails v3 runs the full app teardown synchronously inside WM_ENDSESSION,
overrunning the 5s end-session budget and triggering the "app is
preventing shutdown" screen with a forced kill. Intercept
WM_QUERYENDSESSION/WM_ENDSESSION and exit at once instead, and suppress
error dialogs, toasts, and the hide-on-close hooks once shutdown or a
tray quit has begun.
---
 client/ui/main.go                   |  6 +++++
 client/ui/services/shutdown.go      | 17 ++++++++++++++
 client/ui/services/windowmanager.go |  6 +++++
 client/ui/shutdown_other.go         |  7 ++++++
 client/ui/shutdown_windows.go       | 36 +++++++++++++++++++++++++++++
 client/ui/tray.go                   |  1 +
 client/ui/tray_notify.go            |  3 +++
 7 files changed, 76 insertions(+)
 create mode 100644 client/ui/services/shutdown.go
 create mode 100644 client/ui/shutdown_other.go
 create mode 100644 client/ui/shutdown_windows.go

diff --git a/client/ui/main.go b/client/ui/main.go
index 4889bad79..9a3e17743 100644
--- a/client/ui/main.go
+++ b/client/ui/main.go
@@ -281,6 +281,9 @@ func newApplication(onSecondInstance func()) *application.App {
 		Linux: application.LinuxOptions{
 			ProgramName: "netbird",
 		},
+		Windows: application.WindowsOptions{
+			WndProcInterceptor: endSessionInterceptor(),
+		},
 		SingleInstance: &application.SingleInstanceOptions{
 			UniqueID: "io.netbird.ui",
 			OnSecondInstanceLaunch: func(_ application.SecondInstanceData) {
@@ -367,6 +370,9 @@ func newMainWindow(app *application.App, prefStore *preferences.Store) *applicat
 
 	// Hide instead of quit on close; "really quit" is reached via tray -> Quit.
 	window.RegisterHook(events.Common.WindowClosing, func(e *application.WindowEvent) {
+		if services.ShuttingDown() {
+			return
+		}
 		e.Cancel()
 		window.Hide()
 	})
diff --git a/client/ui/services/shutdown.go b/client/ui/services/shutdown.go
new file mode 100644
index 000000000..81d517099
--- /dev/null
+++ b/client/ui/services/shutdown.go
@@ -0,0 +1,17 @@
+package services
+
+import "sync/atomic"
+
+var shuttingDown atomic.Bool
+
+func BeginShutdown() {
+	shuttingDown.Store(true)
+}
+
+func AbortShutdown() {
+	shuttingDown.Store(false)
+}
+
+func ShuttingDown() bool {
+	return shuttingDown.Load()
+}
diff --git a/client/ui/services/windowmanager.go b/client/ui/services/windowmanager.go
index 1185ec729..bac9790b4 100644
--- a/client/ui/services/windowmanager.go
+++ b/client/ui/services/windowmanager.go
@@ -154,6 +154,9 @@ func NewWindowManager(app *application.App, mainWindow *application.WebviewWindo
 	})
 	// Hide (not destroy) on close to keep React state; reset to General for a flash-free reopen.
 	s.settings.RegisterHook(events.Common.WindowClosing, func(e *application.WindowEvent) {
+		if ShuttingDown() {
+			return
+		}
 		e.Cancel()
 		s.app.Event.Emit(EventSettingsOpen, "general")
 		s.settings.Hide()
@@ -393,6 +396,9 @@ func (s *WindowManager) CloseWelcome() {
 // OpenError shows the custom error dialog; title/message are pre-localised and ride in the
 // start URL. A second error replaces the open one via SetURL. Singleton, destroyed on close.
 func (s *WindowManager) OpenError(title, message string) {
+	if ShuttingDown() {
+		return
+	}
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	startURL := errorDialogURL(title, message)
diff --git a/client/ui/shutdown_other.go b/client/ui/shutdown_other.go
new file mode 100644
index 000000000..6e617233f
--- /dev/null
+++ b/client/ui/shutdown_other.go
@@ -0,0 +1,7 @@
+//go:build !windows && !android && !ios && !freebsd && !js
+
+package main
+
+func endSessionInterceptor() func(hwnd uintptr, msg uint32, wParam, lParam uintptr) (uintptr, bool) {
+	return nil
+}
diff --git a/client/ui/shutdown_windows.go b/client/ui/shutdown_windows.go
new file mode 100644
index 000000000..2f351b1ce
--- /dev/null
+++ b/client/ui/shutdown_windows.go
@@ -0,0 +1,36 @@
+//go:build windows
+
+package main
+
+import (
+	"os"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/netbirdio/netbird/client/ui/services"
+)
+
+const (
+	wmQueryEndSession = 0x0011
+	wmEndSession      = 0x0016
+)
+
+func endSessionInterceptor() func(hwnd uintptr, msg uint32, wParam, lParam uintptr) (uintptr, bool) {
+	return func(_ uintptr, msg uint32, wParam, _ uintptr) (uintptr, bool) {
+		switch msg {
+		case wmQueryEndSession:
+			services.BeginShutdown()
+			return 1, true
+		case wmEndSession:
+			if wParam == 0 {
+				services.AbortShutdown()
+				return 0, true
+			}
+			log.Info("windows session is ending; exiting immediately")
+			os.Exit(0)
+			return 0, true
+		default:
+			return 0, false
+		}
+	}
+}
diff --git a/client/ui/tray.go b/client/ui/tray.go
index 63b6a46ec..589d52dfe 100644
--- a/client/ui/tray.go
+++ b/client/ui/tray.go
@@ -453,6 +453,7 @@ func (t *Tray) buildMenu() *application.Menu {
 }
 
 func (t *Tray) handleQuit() {
+	services.BeginShutdown()
 	t.profileMu.Lock()
 	if t.switchCancel != nil {
 		t.switchCancel()
diff --git a/client/ui/tray_notify.go b/client/ui/tray_notify.go
index 6c60e3d4b..d1117b57b 100644
--- a/client/ui/tray_notify.go
+++ b/client/ui/tray_notify.go
@@ -25,6 +25,9 @@ type sendFn func(notifications.NotificationOptions) error
 // event-dispatch goroutine that panic is fatal process-wide; recover() turns
 // it into a logged no-op.
 func safeSendNotification(send sendFn, what string, opts notifications.NotificationOptions) (err error) {
+	if services.ShuttingDown() {
+		return nil
+	}
 	defer func() {
 		if r := recover(); r != nil {
 			log.Errorf("notify %s: recovered from panic (notification bus unavailable): %v", what, r)