From cba11bff0de40c2dc00b449e99beb41125cdd09a Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Sat, 20 Dec 2014 01:39:28 +0100 Subject: [PATCH] if application exit is forced, perform action even if another exit action is already in progress (IDEA-134537) --- .../intellij/openapi/application/impl/ApplicationImpl.java | 4 +++- 1 file changed, 3 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 90bd90d474d1..abd2c8fc6b52 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 @@ -742,7 +742,9 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App private static volatile boolean exiting = false; public void exit(final boolean force, final boolean exitConfirmed, final boolean allowListenersToCancel, final boolean restart) { - if (exiting) return; + if (!force && exiting) { + return; + } exiting = true; try {