diff --git a/atom/browser/ui/win/atom_desktop_native_widget_aura.cc b/atom/browser/ui/win/atom_desktop_native_widget_aura.cc index e7a311985f..f9f0d1e861 100644 --- a/atom/browser/ui/win/atom_desktop_native_widget_aura.cc +++ b/atom/browser/ui/win/atom_desktop_native_widget_aura.cc @@ -37,7 +37,8 @@ void AtomDesktopNativeWidgetAura::OnWindowActivated( // as it should be. // TODO(brenca): Remove this fix when the chromium issue is fixed. // crbug.com/724538 - tooltip_controller->OnCancelMode(nullptr); + if (tooltip_controller != nullptr) + tooltip_controller->OnCancelMode(nullptr); } }