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.

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

Check for systray error: unable to init instance: Unspecified error #1855

Merged
Merged
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions ee/desktop/runner/runner_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ func osversion() (string, error) {

// logIndicatesSystrayNeedsRestart checks to see if the log line contains
// "tray not ready yet", which indicates that the systray had an irrecoverable
// error during initialization and requires restart.
// error during initialization and requires restart. Sometimes the tray may
// also fail to initialize with "Unspecified error", so we check for the generic
// initialization failed message as well.
func logIndicatesSystrayNeedsRestart(logLine string) bool {
return strings.Contains(logLine, systray.ErrTrayNotReadyYet.Error())
return strings.Contains(logLine, systray.ErrTrayNotReadyYet.Error()) ||
strings.Contains(logLine, "systray error: unable to init instance")
}
Loading