From 97579406cb558411ac0013616ba2dbafef9298d1 Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Mon, 22 Aug 2011 13:16:37 +0400 Subject: [PATCH] IDEA-73396 AE at com.intellij.openapi.components.impl.ComponentManagerImpl.getComponent Added check for the project 'disposed' state --- .../options/editor/CodeFoldingConfigurable.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java index cb757f80140b..71cea9eb856d 100644 --- a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java @@ -85,13 +85,16 @@ public class CodeFoldingConfigurable extends CompositeConfigurable each : toUpdate) { - final CodeFoldingManager foldingManager = CodeFoldingManager.getInstance(each.second); - if (foldingManager != null) { - foldingManager.buildInitialFoldings(each.first); + for (Pair each : toUpdate) { + if (each.second == null || each.second.isDisposed()) { + continue; + } + final CodeFoldingManager foldingManager = CodeFoldingManager.getInstance(each.second); + if (foldingManager != null) { + foldingManager.buildInitialFoldings(each.first); + } } - } - EditorOptionsPanel.reinitAllEditors(); + EditorOptionsPanel.reinitAllEditors(); } }, ModalityState.NON_MODAL); }