From 62e9cc7929094f1fa4ec665f6fde9c66b939072e Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 20 Feb 2015 11:50:53 +0100
Subject: [PATCH] =?UTF-8?q?quick=20fix=20=E2=80=94=20avoid=20NPE=20if=20we?=
 =?UTF-8?q?=20cannot=20find=20font=20by=20console=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/intellij/execution/impl/ConsoleViewUtil.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java b/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
index 150dff080fe5..0880e395308f 100644
--- a/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
+++ b/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
@@ -126,7 +126,11 @@ public class ConsoleViewUtil {
 
       @Override
       public Font getFont(EditorFontType key) {
-        return super.getFont(EditorFontType.getConsoleType(key));
+        Font font = super.getFont(EditorFontType.getConsoleType(key));
+        if (font == null) {
+          return super.getFont(key);
+        }
+        return font;
       }
 
       @Override