From d3b8a38193bbd85e079f698c9dca44e4d8f19133 Mon Sep 17 00:00:00 2001
From: "Vassiliy.Kudryashov" <Vassiliy.Kudryashov@jetbrains.com>
Date: Mon, 16 Mar 2015 20:19:29 +0300
Subject: [PATCH] IDEA-82458 Edit configurations from configurations toolbar
 button doesn't include any existing configurations

---
 .../execution/actions/EditRunConfigurationsAction.java        | 4 ----
 .../src/com/intellij/ide/actions/ToggleFullScreenAction.java  | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java b/platform/lang-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java
index 2ba69009d01b..896da8158c12 100644
--- a/platform/lang-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java
@@ -19,7 +19,6 @@ package com.intellij.execution.actions;
 import com.intellij.execution.ExecutionBundle;
 import com.intellij.execution.impl.EditConfigurationsDialog;
 import com.intellij.icons.AllIcons;
-import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
@@ -40,9 +39,6 @@ public class EditRunConfigurationsAction extends AnAction{
     if (project != null && project.isDisposed()) {
       return;
     }
-    if (project == null) {
-      project = CommonDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext());
-    }
     if (project == null) {
       //setup template project configurations
       project = ProjectManager.getInstance().getDefaultProject();
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ToggleFullScreenAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ToggleFullScreenAction.java
index 3719ad5b8d2e..4dfb322adc5d 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ToggleFullScreenAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ToggleFullScreenAction.java
@@ -57,7 +57,6 @@ public class ToggleFullScreenAction extends ToggleAction implements DumbAware {
     IdeFrameEx frame = null;
     boolean isApplicable = WindowManager.getInstance().isFullScreenSupportedInCurrentOS() && (frame = getFrame()) != null;
 
-    p.setVisible(isApplicable);
     p.setEnabled(isApplicable);
 
     if (isApplicable) {
@@ -70,7 +69,7 @@ public class ToggleFullScreenAction extends ToggleAction implements DumbAware {
     Component focusOwner = IdeFocusManager.getGlobalInstance().getFocusOwner();
     if (focusOwner != null) {
       Window window = focusOwner instanceof JFrame ? (Window) focusOwner : SwingUtilities.getWindowAncestor(focusOwner);
-      if (window instanceof JDialog) {
+      if (!(window instanceof IdeFrameEx)) {
         window = SwingUtilities.getWindowAncestor(window);
       }
       if (window instanceof IdeFrameEx) {