From b4cdeed35f4e1c15a3f7d22632634ef8dd46cbc7 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Wed, 4 May 2016 19:14:29 +0300
Subject: [PATCH] invokeLater if needed

---
 .../src/git4idea/checkin/GitCheckinEnvironment.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
index 5523f992d3c0..dd7d8507803f 100644
--- a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
+++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
@@ -19,7 +19,7 @@ import com.intellij.CommonBundle;
 import com.intellij.dvcs.DvcsCommitAdditionalComponent;
 import com.intellij.dvcs.DvcsUtil;
 import com.intellij.dvcs.push.ui.VcsPushDialog;
-import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -227,8 +227,9 @@ public class GitCheckinEnvironment implements CheckinEnvironment {
       GitRepositoryManager manager = GitUtil.getRepositoryManager(myProject);
       Collection<GitRepository> repositories = GitUtil.getRepositoriesFromRoots(manager, sortedChanges.keySet());
       final List<GitRepository> preselectedRepositories = ContainerUtil.newArrayList(repositories);
-      ApplicationManager.getApplication().invokeLater(() ->
-        new VcsPushDialog(myProject, preselectedRepositories, GitBranchUtil.getCurrentRepository(myProject)).show());
+      GuiUtils.invokeLaterIfNeeded(() ->
+        new VcsPushDialog(myProject, preselectedRepositories, GitBranchUtil.getCurrentRepository(myProject)).show(),
+        ModalityState.defaultModalityState());
     }
     return exceptions;
   }