github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-26 15:58:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Check that atom_touch_bar_ is set

Browse Source
This commit is contained in:
Kevin Sawicki
2017-03-01 15:29:34 -08:00
parent 708ed9d1cd
commit 5fe3ac60fa
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
atom/browser/native_window_mac.mm
View File

@@ -376,16 +376,20 @@ bool ScopedDisableResize::disable_resize_ = false;
}
- (void)refreshTouchBarItem:(const std::string&)item_id {
[atom_touch_bar_ refreshTouchBarItem:item_id];
if (atom_touch_bar_)
[atom_touch_bar_ refreshTouchBarItem:item_id];
}
- (NSTouchBar*)makeTouchBar {
return [atom_touch_bar_ makeTouchBar];
if (atom_touch_bar_)
return [atom_touch_bar_ makeTouchBar];
else
return nil;
}
- (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier {
if (touchBar)
if (touchBar && atom_touch_bar_)
return [atom_touch_bar_ makeItemForIdentifier:identifier];
else
return nil;