From d25e2c7a2d667296b7e096755884ba76d931d928 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Mon, 16 Apr 2012 11:09:03 +0200
Subject: [PATCH] rollback: NPE in painting

---
 .../platform-api/src/com/intellij/openapi/ui/ComboBox.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java b/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java
index d1e0120f5423..0f655992bc4b 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ public class ComboBox extends ComboBoxWithWidePopup implements AWTEventListener
       arrowButton.addMouseListener(new MouseAdapter() {
         @Override
         public void mousePressed(MouseEvent e) {
-          if (!isSwingPopup()) {
+          if (!mySwingPopup) {
             e.consume();
             setPopupVisible(true);
           }
@@ -115,9 +115,6 @@ public class ComboBox extends ComboBoxWithWidePopup implements AWTEventListener
           }
         });
       }
-      else if (!visible) {
-        super.setPopupVisible(visible);
-      }
       return;
     }