From 60bc314a90f1500d79edabcda5e47ae93fd5a514 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 21 Apr 2017 15:58:32 +0200 Subject: [PATCH] let ProgressManager.checkCanceled() not fail in app absence e.g. in ultralight unit tests --- .../src/com/intellij/openapi/progress/ProgressManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java index 754bf2b5913f..7ab4d9b5273b 100644 --- a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java +++ b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java @@ -201,7 +201,9 @@ public abstract class ProgressManager extends ProgressIndicatorProvider { @SuppressWarnings("MethodOverridesStaticMethodOfSuperclass") public static void checkCanceled() throws ProcessCanceledException { - getInstance().doCheckCanceled(); + if (ourInstance != null) { + ourInstance.doCheckCanceled(); + } } /**