Avoids an SWT error at the end of experiments

gama-platform · Oct 16, 2021 · b225846 · b225846
1 parent 96a9111
commit b225846
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/ummisco.gama.opengl/src/ummisco/gama/opengl/view/GamaGLCanvas.java b/ummisco.gama.opengl/src/ummisco/gama/opengl/view/GamaGLCanvas.java
@@ -358,8 +358,9 @@ public boolean setFocus() {
 	 *            the camera
 	 */
 	public void addCameraListeners(final ICamera camera) {
-		if (canvas.isDisposed()) return;
+
 		WorkbenchHelper.asyncRun(() -> {
+			if (isDisposed() || canvas.isDisposed()) return;
 			canvas.addKeyListener(camera);
 			canvas.addMouseListener(camera);
 			canvas.addMouseMoveListener(camera);
@@ -385,8 +386,8 @@ public void addCameraListeners(final ICamera camera) {
 	 *            the camera
 	 */
 	public void removeCameraListeners(final ICamera camera) {
-		if (canvas.isDisposed()) return;
 		WorkbenchHelper.asyncRun(() -> {
+			if (isDisposed() || canvas.isDisposed()) return;
 			canvas.removeKeyListener(camera);
 			canvas.removeMouseListener(camera);
 			canvas.removeMouseMoveListener(camera);