github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-20 10:59:30 +08:00
Code Projects Activity

fix channel cleanup linux

Browse Source
This commit is contained in:
popaprozac 2025-03-22 18:04:30 -07:00
parent 9948cee1f7
commit ace4f70e3a
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
v3/pkg/services/notifications/notifications_linux.go
View File

@ -41,6 +41,9 @@ type linuxNotifier struct {
// Initialization
initOnce sync.Once
initialized bool
monitorCtx context.Context
monitorCancel context.CancelFunc
}
type notificationContext struct {
@ -105,6 +108,8 @@ func (ln *linuxNotifier) initNotificationSystem() error {
ln.Lock()
defer ln.Unlock()
ln.monitorCtx, ln.monitorCancel = context.WithCancel(context.Background())
// Cancel any existing listener
if ln.listenerCancel != nil {
ln.listenerCancel()
@ -210,6 +215,12 @@ func (ln *linuxNotifier) initNotifySend() (string, error) {
func (ln *linuxNotifier) Shutdown() error {
ln.Lock()
// Cancel monitor goroutine first
if ln.monitorCancel != nil {
ln.monitorCancel()
ln.monitorCancel = nil
}
// Cancel the listener context if it's running
if ln.listenerCancel != nil {
ln.listenerCancel()
@ -562,11 +573,16 @@ func (ln *linuxNotifier) monitorDBusConnection(ctx context.Context) chan struct{
disconnected := make(chan struct{})
go func() {
ticker := time.NewTicker(1 * time.Second)
defer ticker.Stop()
for {
select {
case <-ctx.Done():
return // Context cancelled, exit monitor
default:
return // Parent context cancelled
case <-ln.monitorCtx.Done():
return // Monitor specifically cancelled
case <-ticker.C:
ln.Lock()
connected := ln.dbusConn != nil && ln.dbusConn.Connected()
ln.Unlock()
@ -575,7 +591,6 @@ func (ln *linuxNotifier) monitorDBusConnection(ctx context.Context) chan struct{
close(disconnected)
return
}
time.Sleep(1 * time.Second) // Check every second
}
}
}()