Prevents views from being asked to close two or more times

gama-platform · Sep 30, 2021 · 98e1e91 · 98e1e91
1 parent d05036c
commit 98e1e91
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/ummisco.gama.ui.experiment/src/ummisco/gama/ui/views/displays/SWTDisplayView.java b/ummisco.gama.ui.experiment/src/ummisco/gama/ui/views/displays/SWTDisplayView.java
@@ -32,7 +32,7 @@ public abstract class SWTDisplayView extends LayeredDisplayView {
 	@Override
 	public Control[] getZoomableControls() { return new Control[] { surfaceComposite }; }
 
-	@Override
+	@Override 
 	public void setFocus() {
 		if (surfaceComposite != null && !surfaceComposite.isDisposed() && !surfaceComposite.isFocusControl()) {
 			surfaceComposite.forceFocus();
@@ -41,13 +41,13 @@ public void setFocus() {
 
 	@Override
 	public void close(final IScope scope) {
+		if (closing) return;
+		closing = true;
 		DEBUG.OUT("Closing " + this.getPartName());
 		WorkbenchHelper.asyncRun(() -> {
 			try {
 				if (getDisplaySurface() != null) { getDisplaySurface().dispose(); }
-				if (getSite() != null && getSite().getPage() != null) {
-					getSite().getPage().hideView(SWTDisplayView.this);
-				}
+				WorkbenchHelper.hideView(SWTDisplayView.this);
 			} catch (final Exception e) {}
 		});
 

diff --git a/ummisco.gama.ui.shared/src/ummisco/gama/ui/views/GamaViewPart.java b/ummisco.gama.ui.shared/src/ummisco/gama/ui/views/GamaViewPart.java
@@ -73,6 +73,9 @@ public abstract class GamaViewPart extends ViewPart
 	/** The root composite. */
 	private Composite rootComposite;
 
+	/** The closing. */
+	protected volatile boolean closing;
+
 	/**
 	 * The Enum UpdatePriority.
 	 */
@@ -346,6 +349,8 @@ public void displayTooltip(final String text, final GamaUIColor color) {
 
 	@Override
 	public void close(final IScope scope) {
+		if (closing) return;
+		closing = true;
 		DEBUG.OUT("Closing " + this.getPartName());
 		WorkbenchHelper.asyncRun(() -> {
 			try {