StructureDiffViewer.diff: fix Progress #1144

was IllegalStateException toggling whitespace on/off in diff editor eclipse-platform/eclipse.platform.ui#1144
eclipse-platform · Sep 22, 2023 · efe0dce · efe0dce
1 parent 1369cae
commit efe0dce
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java b/...eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
@@ -528,9 +528,11 @@ protected void diff() {
 			// A null compare configuration indicates that the viewer was disposed
 			if (compareConfiguration != null) {
 				compareConfiguration.getContainer().run(true, true, monitor -> {
-					monitor.beginTask(CompareMessages.StructureDiffViewer_2, 100);
-					diffTask.run(SubMonitor.convert(monitor, 100));
-					monitor.done();
+					try {
+						diffTask.run(SubMonitor.convert(monitor, CompareMessages.StructureDiffViewer_2, 100));
+					} finally {
+						monitor.done();
+					}
 				});
 			}
 		} catch (InvocationTargetException e) {