From c45ead89cd8d42052bc3eb1bc1d476090eb78476 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 27 Jan 2012 14:33:13 +0400
Subject: [PATCH] IDEA-80417

---
 .../src/com/intellij/ide/actions/UndoRedoAction.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/actions/UndoRedoAction.java b/platform/platform-impl/src/com/intellij/ide/actions/UndoRedoAction.java
index 0fc43b2ee49a..0d09446cef7a 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/UndoRedoAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/UndoRedoAction.java
@@ -53,7 +53,11 @@ public abstract class UndoRedoAction extends DumbAwareAction {
     }
 
     UndoManager undoManager = getUndoManager(editor, dataContext);
-    presentation.setEnabled(undoManager != null && isAvailable(editor, undoManager));
+    if (undoManager == null) {
+      presentation.setEnabled(false);
+      return;
+    }
+    presentation.setEnabled(isAvailable(editor, undoManager));
 
     Pair<String, String> pair = getActionNameAndDescription(editor, undoManager);