EA fixes: EA-120951, EA-121035

add null-check for the instance of ToolWindowManager
(caused NPE ar TouchBarsManager.lambda$onFocusEvent$)
This commit is contained in:
Artem Bochkarev
2018-05-30 11:34:19 +07:00
parent 1182848882
commit 51723f646d
@@ -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;