From 2379ff4bc7ae390999f3e2a5f67951c085101c3d Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Tue, 18 Aug 2020 20:59:11 +0200
Subject: [PATCH] [instant shutdown] check progress manager

GitOrigin-RevId: ffafe6916f09ee51ad138418e18ca70a3d626a9a
---
 .../openapi/application/impl/ApplicationImpl.java      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
index 00219cd5c8aa..17497fcc5f88 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
@@ -606,7 +606,7 @@ public class ApplicationImpl extends ComponentManagerImpl implements Application
 
       stopServicePreloading();
 
-      if (Registry.is("ide.instant.shutdown")) {
+      if (isInstantShutdownPossible()) {
         for (Frame frame : Frame.getFrames()) {
           frame.setVisible(false);
         }
@@ -647,6 +647,14 @@ public class ApplicationImpl extends ComponentManagerImpl implements Application
     }
   }
 
+  private static boolean isInstantShutdownPossible() {
+    if (!Registry.is("ide.instant.shutdown")) {
+      return false;
+    }
+
+    return !ProgressManager.getInstance().hasProgressIndicator();
+  }
+
   private @NotNull CompletableFuture<ProgressWindow> createProgressWindowAsyncIfNeeded(@NotNull String progressTitle,
                                                                                        boolean canBeCanceled,
                                                                                        boolean shouldShowModalWindow,