mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: crash when tray is destroyed (#14347)

Browse source 
Release the view of status item before destroying it,
gives chance to perform cleanup on the view.
This commit is contained in:
Robo 2018-08-28 23:15:24 +05:30 committed by Shelley Vohr
parent 85ea0518c5
commit 07d017dc01
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/ui/tray_icon_cocoa.mm
View file

@ -41,9 +41,16 @@ const CGFloat kVerticalTitleMargin = 2;
@implementation StatusItemView @implementation StatusItemView
- (void)dealloc {
trayIcon_ = nil;
menuController_ = nil;
[super dealloc];
}
- (id)initWithImage:(NSImage*)image icon:(atom::TrayIconCocoa*)icon { - (id)initWithImage:(NSImage*)image icon:(atom::TrayIconCocoa*)icon {
image_.reset([image copy]); image_.reset([image copy]);
trayIcon_ = icon; trayIcon_ = icon;
menuController_ = nil;
highlight_mode_ = atom::TrayIcon::HighlightMode::SELECTION; highlight_mode_ = atom::TrayIcon::HighlightMode::SELECTION;
ignoreDoubleClickEvents_ = NO; ignoreDoubleClickEvents_ = NO;
forceHighlight_ = NO; forceHighlight_ = NO;
@ -89,6 +96,7 @@ const CGFloat kVerticalTitleMargin = 2;
trackingArea_.reset(); trackingArea_.reset();
} }
[[NSStatusBar systemStatusBar] removeStatusItem:statusItem_]; [[NSStatusBar systemStatusBar] removeStatusItem:statusItem_];
[statusItem_ setView:nil];
statusItem_.reset(); statusItem_.reset();
} }