Skip to content

fix(mac): always run tray_update() on the main thread #157

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

Open
andygrundman wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −9
Open

fix(mac): always run tray_update() on the main thread #157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 18 additions & 9 deletions src/tray_darwin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,24 @@ int tray_loop(int blocking) {
}

void tray_update(struct tray *tray) {
NSImage *image = [[NSImage alloc] initWithContentsOfFile:[NSString stringWithUTF8String:tray->icon]];
NSSize size = NSMakeSize(16, 16);
[image setSize:NSMakeSize(16, 16)];
statusItem.button.image = image;
[statusItem setMenu:_tray_menu(tray->menu)];

// Set tooltip if provided
if (tray->tooltip != NULL) {
statusItem.button.toolTip = [NSString stringWithUTF8String:tray->tooltip];
// This must run on the main thread
void (^updateBlock)(void) = ^{
NSImage *image = [[NSImage alloc] initWithContentsOfFile:[NSString stringWithUTF8String:tray->icon]];
NSSize size = NSMakeSize(16, 16);
[image setSize:NSMakeSize(16, 16)];
statusItem.button.image = image;
[statusItem setMenu:_tray_menu(tray->menu)];

// Set tooltip if provided
if (tray->tooltip != NULL) {
statusItem.button.toolTip = [NSString stringWithUTF8String:tray->tooltip];
}
};

if ([NSThread isMainThread]) {
updateBlock();
} else {
dispatch_sync(dispatch_get_main_queue(), updateBlock);
}
}

Expand Down
Loading