From 5f86b287b7de6e7f28dd55a87f1eca69945ddf3e Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@intellij.com>
Date: Tue, 8 Sep 2009 20:19:47 +0400
Subject: [PATCH] one more check to avoid cyclic initialization of
 KeymapManager

---
 .../keymap/impl/IdeMouseEventDispatcher.java  | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java
index 1e1776041f7f..1a35fc067a78 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java
@@ -59,22 +59,24 @@ public final class IdeMouseEventDispatcher{
 
     // search in main keymap
 
-    KeymapManager keymapManager = KeymapManager.getInstance();
-    if (keymapManager != null) {
-      Keymap keymap = keymapManager.getActiveKeymap();
-      String[] actionIds=keymap.getActionIds(shortcut);
+    if (KeymapManagerImpl.ourKeymapManagerInitialized) {
+      KeymapManager keymapManager = KeymapManager.getInstance();
+      if (keymapManager != null) {
+        Keymap keymap = keymapManager.getActiveKeymap();
+        String[] actionIds=keymap.getActionIds(shortcut);
 
-      ActionManager actionManager = ActionManager.getInstance();
-      for (String actionId : actionIds) {
-        AnAction action = actionManager.getAction(actionId);
-        if (action == null) {
-          continue;
-        }
-        if (isModalContext && !action.isEnabledInModalContext()) {
-          continue;
-        }
-        if (!myActions.contains(action)) {
-          myActions.add(action);
+        ActionManager actionManager = ActionManager.getInstance();
+        for (String actionId : actionIds) {
+          AnAction action = actionManager.getAction(actionId);
+          if (action == null) {
+            continue;
+          }
+          if (isModalContext && !action.isEnabledInModalContext()) {
+            continue;
+          }
+          if (!myActions.contains(action)) {
+            myActions.add(action);
+          }
         }
       }
     }