From 30a44cb7063021fd007aa121c827a3f6dd2bc0bb Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 20 Mar 2012 13:08:10 +0100
Subject: [PATCH] fix NPE (EA-34474)

---
 .../lang-impl/src/com/intellij/ide/actions/GotoActionBase.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
index dd3afc04bb4e..f7586f8ce300 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
@@ -175,7 +175,8 @@ public abstract class GotoActionBase extends AnAction {
       @Override
       public void onClose() {
         ourLastStrings.put(myInAction, Pair.create(popup.getEnteredText(), popup.getSelectedIndex()));
-        if (startedAction.equals(myInAction)) {
+        //noinspection ConstantConditions
+        if (startedAction != null && startedAction.equals(myInAction)) {
           myInAction = null;
         }
         if (filter != null) {