From 44b6c80fae21fdc232d8b61ff7b5eb6da1a4d293 Mon Sep 17 00:00:00 2001
From: dkashyn <dkashyn@salesforce.com>
Date: Thu, 9 Nov 2023 17:29:38 -0500
Subject: [PATCH] Work around NPE for toolwindow

---
 .../idea/blaze/base/toolwindow/TasksTreeConsoleView.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/base/src/com/google/idea/blaze/base/toolwindow/TasksTreeConsoleView.java b/base/src/com/google/idea/blaze/base/toolwindow/TasksTreeConsoleView.java
index 6d223d37390..bb0a996bbe0 100644
--- a/base/src/com/google/idea/blaze/base/toolwindow/TasksTreeConsoleView.java
+++ b/base/src/com/google/idea/blaze/base/toolwindow/TasksTreeConsoleView.java
@@ -91,8 +91,13 @@ private JPanel setupConsolePanel() {
 
   private void treeSelectionChanged(
       ObservableValue<? extends Task> property, Task oldTask, Task newTask) {
+    ConsoleView consoleView = model.getConsolesOfTasks().get(newTask);
+    JComponent content = noSelectionPanel;
+    if (consoleView != null) {
+      content = consoleView.getContent();
+    }
     setConsoleComponent(
-        newTask == null ? noSelectionPanel : model.getConsolesOfTasks().get(newTask).getContent());
+        newTask == null ? noSelectionPanel : content);
   }
 
   private void setConsoleComponent(JComponent component) {