diff --git a/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java b/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java index ba075a6ebe89..43c325fe0886 100644 --- a/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java @@ -19,7 +19,6 @@ import com.intellij.dvcs.DvcsUtil; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; import com.intellij.notification.NotificationType; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; @@ -28,6 +27,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ui.UIUtil; import git4idea.GitPlatformFacade; import git4idea.GitUtil; import git4idea.GitVcs; @@ -160,7 +160,7 @@ class GitMergeOperation extends GitBranchOperation { switch (myDeleteOnMerge) { case DELETE: super.notifySuccess(message); - ApplicationManager.getApplication().invokeLater(new Runnable() { // bg process needs to be started from the EDT + UIUtil.invokeLaterIfNeeded(new Runnable() { // bg process needs to be started from the EDT @Override public void run() { GitBrancher brancher = ServiceManager.getService(myProject, GitBrancher.class);