From 7195c2dd809c7b95b614a4e98289d1608a8ca750 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Tue, 5 Apr 2011 14:02:59 +0200
Subject: [PATCH] EA-26529 - NPE: IntentionSettingsConfigurable.isModified

---
 .../com/intellij/openapi/options/newEditor/OptionsEditor.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
index 42867bdbf181..e59d91e769ed 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
@@ -397,6 +397,7 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat
     LOG.assertTrue(!ApplicationManager.getApplication().isDispatchThread());
     UIUtil.invokeLaterIfNeeded(new Runnable() {
       public void run() {
+        if (myDisposed) return;
         myConfigurable2Content.put(configurable, content);
         result.setDone();
       }