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

Backport (2-0-x) - Fix nil tray title crash #12356

Merged
merged 2 commits into from Mar 23, 2018
Merged

Backport (2-0-x) - Fix nil tray title crash #12356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a298750
Add check for title_ being nil
codebytere Mar 19, 2018
72c8dbc
remove print stub
codebytere Mar 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion atom/browser/ui/tray_icon_cocoa.mm
View file
Open in desktop
Expand Up @@ -230,8 +230,13 @@ - (void)updateAttributedTitle {
return;
}

// check title_ being nil
NSString *title = @"";
if (title_)
title = title_;

attributedTitle_.reset([[NSMutableAttributedString alloc]
initWithString:title_
initWithString:title
attributes:attributes]);

//NSFontAttributeName:[NSFont menuBarFontOfSize:0],
Expand Down