From daa7bc4b53f6a6b18d403bbb48cca7eab8bf8b15 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 30 Apr 2012 13:25:51 +0400
Subject: [PATCH] EA-35260 Fix already disposed

---
 plugins/git4idea/src/git4idea/GitUtil.java                  | 3 +++
 .../git4idea/src/git4idea/commands/GitCompoundResult.java   | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/GitUtil.java b/plugins/git4idea/src/git4idea/GitUtil.java
index 8556b790634b..f4be63494bea 100644
--- a/plugins/git4idea/src/git4idea/GitUtil.java
+++ b/plugins/git4idea/src/git4idea/GitUtil.java
@@ -608,6 +608,9 @@ public class GitUtil {
   }
   
   public static boolean justOneGitRepository(Project project) {
+    if (project.isDisposed()) {
+      return true;
+    }
     GitRepositoryManager manager = getRepositoryManager(project);
     if (manager == null) {
       return true;
diff --git a/plugins/git4idea/src/git4idea/commands/GitCompoundResult.java b/plugins/git4idea/src/git4idea/commands/GitCompoundResult.java
index a0ea8be656f2..cfc906f03bd6 100644
--- a/plugins/git4idea/src/git4idea/commands/GitCompoundResult.java
+++ b/plugins/git4idea/src/git4idea/commands/GitCompoundResult.java
@@ -79,7 +79,7 @@ public final class GitCompoundResult {
       GitCommandResult result = entry.getValue();
       if (!result.success()) {
         sb.append("<p>");
-        if (!onlyOneRepositoryInTheProject()) {
+        if (!GitUtil.justOneGitRepository(myProject)) {
           sb.append("<code>" + repository.getPresentableUrl() + "</code>:<br/>");
         }
         sb.append(result.getErrorOutputAsHtmlString());
@@ -88,8 +88,4 @@ public final class GitCompoundResult {
     }
     return sb.toString();
   }
-  
-  private boolean onlyOneRepositoryInTheProject() {
-    return !GitUtil.getRepositoryManager(myProject).moreThanOneRoot();
-  }
 }