Skip to content
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

Jump to bottom

dont build menu when not showing, update systray #1897

Merged
merged 3 commits into from
Oct 18, 2024
Merged

dont build menu when not showing, update systray #1897

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e8bf78
dont build menu when not showing
James-Pickett Oct 18, 2024
f90c025
var name change
James-Pickett Oct 18, 2024
48e5592
upgrade systray
James-Pickett Oct 18, 2024
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
5 changes: 5 additions & 0 deletions ee/desktop/user/menu/menu_systray.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
buildMutex.Lock()
defer buildMutex.Unlock()

if !systray.IsReady() {

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / govulncheck (ubuntu-latest) 

undefined: systray.IsReady

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / govulncheck (macos-latest) 

undefined: systray.IsReady

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

undefined: systray.IsReady) (typecheck)

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

undefined: systray.IsReady) (typecheck)

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

undefined: systray.IsReady (typecheck)

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

undefined: systray.IsReady) (typecheck)

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

undefined: systray.IsReady) (typecheck)

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

undefined: systray.IsReady (typecheck)

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / launcher (ubuntu-20.04) 

undefined: systray.IsReady

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / launcher (ubuntu-20.04) 

undefined: systray.IsReady

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / lint (macos-latest) 

undefined: systray.IsReady) (typecheck)

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / lint (macos-latest) 

undefined: systray.IsReady) (typecheck)

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / lint (macos-latest) 

undefined: systray.IsReady (typecheck)

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / lint (macos-latest) 

undefined: systray.IsReady) (typecheck)

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / lint (macos-latest) 

undefined: systray.IsReady) (typecheck)

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / lint (macos-latest) 

undefined: systray.IsReady (typecheck)

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / govulncheck (windows-latest) 

undefined: systray.IsReady

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / launcher (macos-13) 

undefined: systray.IsReady

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / launcher (macos-13) 

undefined: systray.IsReady

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / launcher (windows-latest) 

undefined: systray.IsReady

Check failure on line 43 in ee/desktop/user/menu/menu_systray.go

View workflow job for this annotation

GitHub Actions / launcher (windows-latest) 

undefined: systray.IsReady
// if we never started the menu, don't do anything
return
}

// Remove all menu items each time we rebuild the menu
systray.ResetMenu()

Expand Down
Loading