From 8d4a20f0cbb8faa6db165858ea2545bcaadd1937 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 27 Dec 2011 13:27:07 +0100 Subject: [PATCH] EA-32676 (NPE) --- .../application/options/InitialConfigurationDialog.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java b/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java index 577d96bb4f0e..a9446399ccf3 100644 --- a/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java +++ b/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java @@ -105,7 +105,9 @@ public class InitialConfigurationDialog extends DialogWrapper { myColorSchemeComboBox.setRenderer(new ListCellRendererWrapper(myColorSchemeComboBox.getRenderer()) { @Override public void customize(JList list, Object value, int index, boolean selected, boolean cellHasFocus) { - setText(((EditorColorsScheme)value).getName()); + if (value != null) { + setText(((EditorColorsScheme)value).getName()); + } } }); myColorSchemeComboBox.addActionListener(new ActionListener() {