diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
| commit | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | c3d3a90f6b4ead083d63e28e6b9fcea93d675678 (diff) | |
| download | idea-d245f58efbfc26b13b9b9d5e52e6a83a0d76216c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Diffstat (limited to 'platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java')
| -rw-r--r-- | platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 4b4ace28cd37..3f0601ba951b 100644 --- a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java +++ b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java @@ -184,7 +184,7 @@ public abstract class ProgressManager extends ProgressIndicatorProvider { throws ProcessCanceledException { ProgressIndicator oldIndicator = null; - boolean set = progress != null && progress != (oldIndicator = myThreadIndicator.get()); + boolean set = progress != null && progress != (oldIndicator = getProgressIndicator()); if (set) { myThreadIndicator.set(progress); } |