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 2856c8b601c6..4ad95ff25870 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 @@ -290,7 +290,7 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App ShutDownTracker.getInstance().registerShutdownTask(new Runnable() { @Override public void run() { - if (isDisposed() || isDisposeInProgress()) { + if (isDisposed() || myDisposeInProgress) { return; } ShutDownTracker.invokeAndWait(isUnitTestMode(), true, new Runnable() {