From 51723f646da075dc50a857416e62a5852f0cfe17 Mon Sep 17 00:00:00 2001
From: Artem Bochkarev <artem.bochkarev@jetbrains.com>
Date: Tue, 29 May 2018 19:08:36 +0700
Subject: [PATCH] EA fixes: EA-120951, EA-121035

add null-check for the instance of ToolWindowManager
(caused NPE ar TouchBarsManager.lambda$onFocusEvent$)
---
 .../src/com/intellij/ui/mac/touchbar/TouchBarsManager.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TouchBarsManager.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TouchBarsManager.java
index 4a0353f23350..10a80fa5d451 100644
--- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TouchBarsManager.java
+++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TouchBarsManager.java
@@ -202,7 +202,11 @@ public class TouchBarsManager {
     // NOTE: WindowEvent.WINDOW_GAINED_FOCUS can be fired when frame focuse
     if (e.getID() == FocusEvent.FOCUS_GAINED) {
       ourProjectData.forEach((project, data) -> {
-        final ToolWindow dtw = ToolWindowManagerEx.getInstanceEx(project).getToolWindow(ToolWindowId.DEBUG);
+        final ToolWindowManagerEx twm = ToolWindowManagerEx.getInstanceEx(project);
+        if (twm == null)
+          return;
+
+        final ToolWindow dtw = twm.getToolWindow(ToolWindowId.DEBUG);
         if (dtw == null)
           return;