From 4d95d72aac4f7da28ddc3bc94d3a993e3491dd87 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 23 Feb 2012 21:33:10 +0100
Subject: [PATCH] NPE

---
 platform/platform-impl/src/com/intellij/ui/EditorComboBox.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java b/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java
index 6ca0f930bc7b..e20f02484fb0 100644
--- a/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java
+++ b/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java
@@ -86,7 +86,7 @@ public class EditorComboBox extends JComboBox implements DocumentListener {
 
     addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
-        final Editor editor = myEditorField.getEditor();
+        final Editor editor = myEditorField != null ? myEditorField.getEditor() : null;
         if (editor != null) {
           editor.getSelectionModel().removeSelection();
         }