github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-12 23:19:29 +08:00
Code Projects Activity

remove deadlock

Browse Source
This commit is contained in:
popaprozac 2025-03-23 00:05:20 -07:00
parent 5ddb27fd3f
commit a68391880c
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,6 @@ func (ln *linuxNotifier) SendNotification(options NotificationOptions) error {
hints["x-wails-metadata"] = dbus.MakeVariant(string(metadataJSON)) hints["x-wails-metadata"] = dbus.MakeVariant(string(metadataJSON))
actions := []string{} actions := []string{}
timeout := int32(0)
// Call the Notify method on the D-Bus interface // Call the Notify method on the D-Bus interface
obj := ln.conn.Object(dbusNotificationInterface, dbusNotificationPath) obj := ln.conn.Object(dbusNotificationInterface, dbusNotificationPath)
@ -143,7 +142,7 @@ func (ln *linuxNotifier) SendNotification(options NotificationOptions) error {
body, body,
actions, actions,
hints, hints,
timeout, uint32(0),
) )
if call.Err != nil { if call.Err != nil {
@ -156,7 +155,6 @@ func (ln *linuxNotifier) SendNotification(options NotificationOptions) error {
} }
ln.activeNotifsLock.Lock() ln.activeNotifsLock.Lock()
ln.activeNotifs[notifID] = options.ID ln.activeNotifs[notifID] = options.ID
metadata := map[string]interface{}{ metadata := map[string]interface{}{
@ -221,8 +219,6 @@ func (ln *linuxNotifier) SendNotificationWithActions(options NotificationOptions
} }
hints["x-wails-metadata"] = dbus.MakeVariant(string(metadataJSON)) hints["x-wails-metadata"] = dbus.MakeVariant(string(metadataJSON))
timeout := int32(0)
obj := ln.conn.Object(dbusNotificationInterface, dbusNotificationPath) obj := ln.conn.Object(dbusNotificationInterface, dbusNotificationPath)
call := obj.Call( call := obj.Call(
dbusNotificationInterface+".Notify", dbusNotificationInterface+".Notify",
@ -234,7 +230,7 @@ func (ln *linuxNotifier) SendNotificationWithActions(options NotificationOptions
body, body,
actions, actions,
hints, hints,
timeout, uint32(0),
) )
if call.Err != nil { if call.Err != nil {
@ -481,7 +477,7 @@ func (ln *linuxNotifier) handleSignals(ctx context.Context, c chan *dbus.Signal)
// Handle ActionInvoked signal. // Handle ActionInvoked signal.
func (ln *linuxNotifier) handleActionInvoked(signal *dbus.Signal) { func (ln *linuxNotifier) handleActionInvoked(signal *dbus.Signal) {
if len(signal.Body) < 2 { if len(signal.Body) < 1 {
return return
} }