From 38aed46dac36efea5a2fe55c7e58fb9e029e5b9c Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 6 Apr 2016 11:36:20 +0200
Subject: [PATCH] ChangeListManagerImpl.waitEverythingDoneInTestMode: dispatch
 UI events only when on EDT

---
 .../intellij/openapi/vcs/changes/ChangeListManagerImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
index 367bf750473e..df48ba1c74d5 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
@@ -1686,7 +1686,9 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
       Future future = ourUpdateAlarm.get();
       if (future == null) break;
 
-      UIUtil.dispatchAllInvocationEvents();
+      if (ApplicationManager.getApplication().isDispatchThread()) {
+        UIUtil.dispatchAllInvocationEvents();
+      }
       try {
         future.get(10, TimeUnit.MILLISECONDS);
         break;