From 1b4c9945cbd318d7b13ef6acf1480cc20d82eb6a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 27 Jun 2016 16:08:42 +0300 Subject: [PATCH] [platform] app state check (IDEA-157865) --- .../com/intellij/openapi/updateSettings/impl/UpdateChecker.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt index efa90383ddac..e1d36d9c5df9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt @@ -589,8 +589,8 @@ object UpdateChecker { @JvmStatic fun checkForUpdate(event: IdeaLoggingEvent) { if (!ourHasFailedPlugins) { - val settings = UpdateSettings.getInstance() - if (settings != null && settings.isCheckNeeded) { + val app = ApplicationManager.getApplication() + if (!app.isDisposed && !app.isDisposeInProgress && UpdateSettings.getInstance().isCheckNeeded) { val pluginDescriptor = PluginManager.getPlugin(IdeErrorsDialog.findPluginId(event.throwable)) if (pluginDescriptor != null && !pluginDescriptor.isBundled) { ourHasFailedPlugins = true