From 9cbfd99842d78a5d8fb1be4463ccf1e2f24d4b04 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 11 Mar 2011 18:27:01 +0100
Subject: [PATCH] don't try to start process with progress outside of EDT
 (EA-25983)

---
 .../openapi/updateSettings/impl/UpdateChecker.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
index 322b1a11602b..863c7aa05387 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
@@ -214,7 +214,7 @@ public final class UpdateChecker {
       }
 
       final String finalPluginUrl = pluginUrl;
-      ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
+      Runnable updatePluginRunnable = new Runnable() {
         public void run() {
           try {
             final ProgressIndicator progressIndicator = ProgressManager.getInstance().getProgressIndicator();
@@ -230,7 +230,13 @@ public final class UpdateChecker {
             LOG.info(e);
           }
         }
-      }, IdeBundle.message("update.uploading.plugin.progress.title"), true, null);
+      };
+      if (ApplicationManager.getApplication().isDispatchThread()) {
+        ProgressManager.getInstance().runProcessWithProgressSynchronously(updatePluginRunnable, IdeBundle.message("update.uploading.plugin.progress.title"), true, null);
+      }
+      else {
+        updatePluginRunnable.run();
+      }
     }
     return success;
   }