From 39aece545e5249edd4d3c15316e7300de3a2859c Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Fri, 30 Jun 2017 22:21:01 +0300
Subject: [PATCH] [vcs-log] do not use invoke later if recreateLog was called
 in EDT

---
 .../impl/src/com/intellij/vcs/log/impl/VcsProjectLog.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsProjectLog.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsProjectLog.java
index 7f1c67c4cd43..81a3db67cae0 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsProjectLog.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsProjectLog.java
@@ -19,6 +19,7 @@ import com.intellij.ide.caches.CachesInvalidator;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ApplicationNamesInfo;
+import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -28,6 +29,7 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.VcsRoot;
 import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
+import com.intellij.ui.GuiUtils;
 import com.intellij.util.messages.MessageBus;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.messages.Topic;
@@ -92,7 +94,7 @@ public class VcsProjectLog implements Disposable {
 
   @CalledInAny
   private void recreateLog() {
-    ApplicationManager.getApplication().invokeLater(() -> {
+    GuiUtils.invokeLaterIfNeeded(() -> {
       disposeLog();
 
       ApplicationManager.getApplication().executeOnPooledThread(() -> {
@@ -100,7 +102,7 @@ public class VcsProjectLog implements Disposable {
           createLog();
         }
       });
-    });
+    }, ModalityState.any());
   }
 
   @CalledInAwt