From fa3aa57d95221d85ab75f8d52c90176d73e97b0c Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Fri, 22 Apr 2016 17:04:57 +0300 Subject: [PATCH] EA-81297 - NPE: ColorAndFontOptions.getPanels --- .../com/intellij/application/options/colors/FontOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/FontOptions.java b/platform/lang-impl/src/com/intellij/application/options/colors/FontOptions.java index 7ac5e87668fb..6a14e51b5b72 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/FontOptions.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/FontOptions.java @@ -211,7 +211,7 @@ public class FontOptions extends JPanel implements OptionsPanel{ Object source = event.getSource(); if (source instanceof FontComboBox) { FontComboBox combo = (FontComboBox)source; - if (combo.isEnabled() && combo.getSelectedItem() != null) { + if (combo.isEnabled() && combo.isShowing() && combo.getSelectedItem() != null) { syncFontFamilies(); } }