From 727f926eedf706fbbbaa0dad64680296352f735d Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Thu, 16 Aug 2012 18:43:59 +0400
Subject: [PATCH] Add if (myProject.isDisposed()) return;

---
 .../org/jetbrains/idea/maven/project/MavenProjectsManager.java  | 2 ++
 .../idea/maven/project/MavenProjectsManagerWatcher.java         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
index c566f537d32c..87cab00f3b7c 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
@@ -262,6 +262,8 @@ public class MavenProjectsManager extends MavenSimpleProjectComponent
   private void listenForSettingsChanges() {
     getImportingSettings().addListener(new MavenImportingSettings.Listener() {
       public void autoImportChanged() {
+        if (myProject.isDisposed()) return;
+
         if (getImportingSettings().isImportAutomatically()) {
           scheduleImportAndResolve();
         }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
index 4506e0846910..1c35a719ad44 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
@@ -266,6 +266,8 @@ public class MavenProjectsManagerWatcher {
     Runnable onCompletion = new Runnable() {
       @Override
       public void run() {
+        if (myProject.isDisposed()) return;
+
         if (forceImportAndResolve || myManager.getImportingSettings().isImportAutomatically()) {
           myManager.scheduleImportAndResolve();
         }