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

[vcs-log] cancel indicators that are started after VcsLogProgress is disposed

Browse Source
This commit is contained in:
Julia Beliaeva
2017-11-27 18:47:57 +03:00
parent 0e95bb4eaf
commit e6d0b5f657
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogProgress.java
+6
View File
@@ -35,6 +35,7 @@ public class VcsLogProgress implements Disposable {
@NotNull private final List<ProgressListener> myListeners = ContainerUtil.newArrayList();
@NotNull private final Set<ProgressIndicator> myTasksWithVisibleProgress = ContainerUtil.newHashSet();
@NotNull private final Set<ProgressIndicator> myTasksWithSilentProgress = ContainerUtil.newHashSet();
private boolean myDisposed = false;
public VcsLogProgress(@NotNull Project project, @NotNull Disposable parent) {
Disposer.register(parent, () -> Disposer.dispose(this));
@@ -78,6 +79,10 @@ public class VcsLogProgress implements Disposable {
private void started(@NotNull VcsLogProgressIndicator indicator) {
synchronized (myLock) {
if (myDisposed) {
indicator.cancel();
return;
}
if (indicator.isVisible()) {
myTasksWithVisibleProgress.add(indicator);
if (myTasksWithVisibleProgress.size() == 1) fireNotification(ProgressListener::progressStarted);
@@ -110,6 +115,7 @@ public class VcsLogProgress implements Disposable {
@Override
public void dispose() {
synchronized (myLock) {
myDisposed = true;
for (ProgressIndicator indicator : myTasksWithVisibleProgress) {
indicator.cancel();
}