From 4ee5bd469069be0c199e042e3a06c0e0652e7a44 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Wed, 5 Nov 2014 15:44:04 +0300
Subject: [PATCH] go to action action: open settings dialog from the welcome
 screen (relates IDEA-132152)

---
 .../src/com/intellij/ide/actions/GotoActionAction.java |  2 +-
 .../com/intellij/ide/actions/ShowSettingsAction.java   | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
index 92956b3badaa..24d6f3023ebf 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
@@ -201,7 +201,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
                                                         ActionManager.getInstance(),
                                                         e == null ? 0 : e.getModifiers());
 
-          if (ActionUtil.lastUpdateAndCheckDumb(action, event, true)) {
+          if (ActionUtil.lastUpdateAndCheckDumb(action, event, false)) {
             if (action instanceof ActionGroup) {
               ListPopup popup = JBPopupFactory.getInstance().createActionGroupPopup(presentation.getText(),
                                                                                     (ActionGroup)action, context,
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java
index 5ced3f0db498..98b371e366eb 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java
@@ -17,13 +17,17 @@ package com.intellij.ide.actions;
 
 import com.intellij.CommonBundle;
 import com.intellij.icons.AllIcons;
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.ActionPlaces;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.application.ex.ApplicationManagerEx;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.util.SystemInfo;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 
@@ -33,7 +37,7 @@ public class ShowSettingsAction extends AnAction implements DumbAware {
   }
 
   @Override
-  public void update(AnActionEvent e) {
+  public void update(@NotNull AnActionEvent e) {
     if (SystemInfo.isMac && ActionPlaces.isMainMenuOrActionSearch(e.getPlace())) {
       // It's called from Preferences in App menu.
       e.getPresentation().setVisible(false);
@@ -43,7 +47,7 @@ public class ShowSettingsAction extends AnAction implements DumbAware {
     }
   }
 
-  public void actionPerformed(AnActionEvent e) {
+  public void actionPerformed(@NotNull AnActionEvent e) {
     Project project = CommonDataKeys.PROJECT.getData(e.getDataContext());
     if (project == null) {
       project = ProjectManager.getInstance().getDefaultProject();