From f36fda3f5d5360eebe3132f3c0c6873b045571d9 Mon Sep 17 00:00:00 2001
From: Heilig Benedek <benecene@gmail.com>
Date: Thu, 18 Jan 2018 20:35:19 +0100
Subject: [PATCH] don't dereference tooltip_controller if it's null

---
 atom/browser/ui/win/atom_desktop_native_widget_aura.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 e7a311985f2..f9f0d1e8610 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);
   }
 }