Skip to content

Commit 0663bb0

Browse files
EcljpseB0Tiloveeclipse
authored andcommitted
WorkbenchWindow: use same IProgressMonitor instance
getProgressMonitor() can return a new instance each time. https://bugs.eclipse.org/bugs/show_bug.cgi?id=485748
1 parent 8982941 commit 0663bb0

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.eclipse.core.runtime.IAdaptable;
4848
import org.eclipse.core.runtime.IConfigurationElement;
4949
import org.eclipse.core.runtime.IExtensionRegistry;
50+
import org.eclipse.core.runtime.IProgressMonitor;
5051
import org.eclipse.core.runtime.ListenerList;
5152
import org.eclipse.core.runtime.NullProgressMonitor;
5253
import org.eclipse.core.runtime.Platform;
@@ -2342,14 +2343,15 @@ public void run(final boolean fork, boolean cancelable, final IRunnableWithProgr
23422343
final InterruptedException[] ie = new InterruptedException[1];
23432344

23442345
BusyIndicator.showWhile(getShell().getDisplay(), () -> {
2346+
IProgressMonitor progressMonitor = manager.getProgressMonitor();
23452347
try {
2346-
ModalContext.run(runnable, fork, manager.getProgressMonitor(), getShell().getDisplay());
2348+
ModalContext.run(runnable, fork, progressMonitor, getShell().getDisplay());
23472349
} catch (InvocationTargetException e1) {
23482350
ite[0] = e1;
23492351
} catch (InterruptedException e2) {
23502352
ie[0] = e2;
23512353
} finally {
2352-
manager.getProgressMonitor().done();
2354+
progressMonitor.done();
23532355
}
23542356
});
23552357

0 commit comments

Comments
 (0)