From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 12 Feb 2010 11:18:29 +0000 (+0300)
Subject: fix NPE in UndoRedoAction update
X-Git-Tag: 94.295^2
X-Git-Url: https://repo.or.cz/w/fedora-idea.git/commitdiff_plain/1d40c8e889ff1b8d353c9c1c4747d5ddb04c580f

fix NPE in UndoRedoAction update
---

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 08c443ef12..4ebd989e3d 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/UndoRedoAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/UndoRedoAction.java
@@ -56,9 +56,12 @@ public abstract class UndoRedoAction extends DumbAwareAction {
     FileEditor editor = PlatformDataKeys.FILE_EDITOR.getData(dataContext);
 
     // do not allow global undo in dialogs
-    if (editor == null && PlatformDataKeys.IS_MODAL_CONTEXT.getData(dataContext)) {
-      presentation.setEnabled(false);
-      return;
+    if (editor == null) {
+      final Boolean isModalContext = PlatformDataKeys.IS_MODAL_CONTEXT.getData(dataContext);
+      if (isModalContext != null && isModalContext) {
+        presentation.setEnabled(false);
+        return;
+      }
     }
 
     UndoManager undoManager = getUndoManager(editor, dataContext);