From e2bcfdad2101b8649cf3739ac608f1cb617d2d25 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 31 May 2011 12:44:16 +0200 Subject: [PATCH] NPE in log --- .../notification/impl/NotificationsManagerImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java index fc9b0c3b0c24..6f3d27201132 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java @@ -22,6 +22,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ApplicationComponent; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.*; +import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.openapi.wm.WindowManager; import com.intellij.openapi.wm.impl.IdeFrameImpl; @@ -243,7 +244,12 @@ public class NotificationsManagerImpl extends NotificationsManager implements No } public static boolean isEventLogVisible(Project project) { - return project != null && ToolWindowManager.getInstance(project).getToolWindow(LOG_TOOL_WINDOW_ID).isVisible(); + if (project == null) { + return false; + } + + final ToolWindow window = ToolWindowManager.getInstance(project).getToolWindow(LOG_TOOL_WINDOW_ID); + return window != null && window.isVisible(); } private static PairFunction createFilter(@Nullable final Project project, final boolean strict) {