MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

unwrap thread's WrappedProgressIndicator when inner indicator is cancelled, same way as we do during registerIndicatorAndRun (IDEA-132931)

Browse Source
This commit is contained in:
Maxim.Mossienko
2014-11-14 19:46:10 +01:00
parent ecea2a02e6
commit 54d28fa7c9
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java
+13 -1
View File
@@ -323,7 +323,19 @@ public class ProgressManagerImpl extends ProgressManager implements Disposable {
if (threads != null) {
for (Thread thread : threads) {
ProgressIndicator currentIndicator = getCurrentIndicator(thread);
if (currentIndicator == indicator) {
boolean underCancelledIndicator = currentIndicator == indicator;
if (!underCancelledIndicator && currentIndicator instanceof WrappedProgressIndicator) {
while(currentIndicator instanceof WrappedProgressIndicator) {
ProgressIndicator originalProgressIndicator = ((WrappedProgressIndicator)currentIndicator).getOriginalProgressIndicator();
if (originalProgressIndicator == indicator) {
underCancelledIndicator = true;
break;
}
currentIndicator = originalProgressIndicator;
}
}
if (underCancelledIndicator) {
threadsUnderCanceledIndicator.add(thread);
}
}