From aef38f6429ace5ee7bd76675478ed421bf566ce6 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 6 May 2024 08:45:42 +0200
Subject: [PATCH] Improve mini desktop clean up

---
 .../org/argeo/minidesktop/MiniDesktopManager.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/swt/org.argeo.swt.minidesktop/src/org/argeo/minidesktop/MiniDesktopManager.java b/swt/org.argeo.swt.minidesktop/src/org/argeo/minidesktop/MiniDesktopManager.java
index 6604b4f3e..7bce69f73 100644
--- a/swt/org.argeo.swt.minidesktop/src/org/argeo/minidesktop/MiniDesktopManager.java
+++ b/swt/org.argeo.swt.minidesktop/src/org/argeo/minidesktop/MiniDesktopManager.java
@@ -55,8 +55,10 @@ public class MiniDesktopManager {
 	public void stop() {
 		dispose();
 		if (display != null) {
-			display.dispose();
-			display = null;
+			display.syncExec(() -> {
+				display.dispose();
+				display = null;
+			});
 		}
 	}
 
@@ -288,8 +290,11 @@ public class MiniDesktopManager {
 	}
 
 	public void dispose() {
-		if (!rootShell.isDisposed())
-			rootShell.dispose();
+		if (!rootShell.isDisposed()) {
+			rootShell.getDisplay().syncExec(() -> {
+				rootShell.dispose();
+			});
+		}
 	}
 
 	protected boolean isFullscreen() {
-- 
2.39.5