From d35a4b83e342fb756e08f2e91ce90e7ecf5b1f28 Mon Sep 17 00:00:00 2001
From: Alexey Pegov <alexey.pegov@jetbrains.com>
Date: Thu, 22 Oct 2009 18:51:34 +0400
Subject: [PATCH] fix choose run configuration popup: ensure alternative
 executor reset

---
 .../intellij/execution/actions/ChooseRunConfigurationAction.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java
index e2c8889648..29d9f86829 100644
--- a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java
@@ -122,7 +122,12 @@ public class ChooseRunConfigurationAction extends AnAction {
 
     popup.registerAction("invokeAction", KeyStroke.getKeyStroke("shift ENTER"), new AbstractAction() {
       public void actionPerformed(ActionEvent e) {
-        popup.handleSelect(true);
+        try {
+          popup.handleSelect(true);
+        }
+        finally {
+          myCurrentExecutor = null;
+        }
       }
     });
 
@@ -613,7 +618,7 @@ public class ChooseRunConfigurationAction extends AnAction {
       if (finalChoice && wrapper.available(executor)) {
         SwingUtilities.invokeLater(new Runnable() {
           public void run() {
-            if (myAction.getCurrentExecutor() == myAction.getAlternateExecutor()) {
+            if (executor == myAction.getAlternateExecutor()) {
               PropertiesComponent.getInstance().setValue(myAction.getAdKey(), Boolean.toString(true));
             }
 
-- 
2.11.4.GIT