From 7d4928eafaf6238230375bb5e7c3d0fcd3fd40ef Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sat, 25 Jun 2016 17:58:26 +0300 Subject: [PATCH] Use correct modality state for CLM.freeze() E.g. if Update Project happens under a modal progress (instead of bg). Relates to IDEA-156339. --- .../com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 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 447852c059b3..ea0cf27e36d9 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 @@ -395,7 +395,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec freezeImmediately(reason); context.ping(); } - }, InvokeAfterUpdateMode.SILENT_CALLBACK_POOLED, "", ModalityState.NON_MODAL); + }, InvokeAfterUpdateMode.SILENT_CALLBACK_POOLED, "", ModalityState.defaultModalityState()); context.suspend(); }