Skip to content

Fix Deadlock and item ordering in Windows #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2019
Merged

Fix Deadlock and item ordering in Windows #103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b50ed9a
Fix deadlock on Windows on menu item click
ldstein Nov 20, 2019
efdc615
Fixed increment of item id of first item
ldstein Nov 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion systray_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,23 @@ func ShowAppWindow(url string) {
func addOrUpdateMenuItem(item *MenuItem) {
action := actions[item.id]
if action == nil {
item.id = atomic.AddInt32(&nextActionId, 1)
item.id = nextActionId
action = walk.NewAction()
action.Triggered().Attach(func() {
// Ensure there is at least one receiver to prevent deadlock
go func() {
select {
case <-item.ClickedCh:
}
}()

item.ClickedCh <- struct{}{}
})
if err := notifyIcon.ContextMenu().Actions().Add(action); err != nil {
fail("Unable to add menu item to systray", err)
}
actions[item.id] = action
atomic.AddInt32(&nextActionId, 1)
}
err := action.SetText(item.title)
if err != nil {
Expand Down