From 1d40c8e889ff1b8d353c9c1c4747d5ddb04c580f Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 12 Feb 2010 14:18:29 +0300 Subject: [PATCH] fix NPE in UndoRedoAction update --- .../src/com/intellij/ide/actions/UndoRedoAction.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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); -- 2.11.4.GIT