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

Use scoped_nsobject to match Chrome implementation

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-28 16:44:03 -08:00
parent 812beb240b
commit ec500b2852
3 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/native_window_mac.mm
View file

@ -383,7 +383,10 @@ bool ScopedDisableResize::disable_resize_ = false;
- (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier {
return [atom_touch_bar_ makeItemForIdentifier:identifier];
if (touchBar)
return [atom_touch_bar_ makeItemForIdentifier:identifier];
else
return nil;
}
// NSWindow overrides.