From 18b57b20c19f80365e71a7a03891905f2bc5af67 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Tue, 17 Mar 2015 19:42:02 +0300
Subject: [PATCH] IDEA-137716 Do not return invisible combo box as preferred
 focus owner

---
 .../src/com/intellij/tasks/actions/CloseTaskDialog.java        | 2 +-
 .../src/com/intellij/tasks/actions/OpenTaskDialog.java         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskDialog.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskDialog.java
index 73d14d23435a..3fd1662b7852 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskDialog.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/CloseTaskDialog.java
@@ -95,7 +95,7 @@ public class CloseTaskDialog extends DialogWrapper {
   @Nullable
   @Override
   public JComponent getPreferredFocusedComponent() {
-    return myStateCombo.getComboBox();
+    return myStateCombo.isVisible() ? myStateCombo.getComboBox() : null;
   }
 
   @Nullable
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java
index 485161687d68..a00660449046 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java
@@ -274,9 +274,10 @@ public class OpenTaskDialog extends DialogWrapper {
     else if (myCreateChangelist.isSelected()) {
       return myChangelistName;
     }
-    else {
+    else if (myTaskStateCombo.isVisible()){
       return myTaskStateCombo.getComboBox();
     }
+    return null;
   }
 
   protected JComponent createCenterPanel() {