Bug 368281 SWTException thrown when closing a workbench window with av20120110-1739

part menu up

A menu may be disposed before it the event dispatch loop returns
so we need to check if a menu has been disposed or not before we
check its data.

1 files changed, 1 insertions, 1 deletions

diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java
index 59965f0ca8a..ee4c7704798 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java
@@ -849,7 +849,7 @@ public class StackRenderer extends LazyStackRenderer {
 			if (!display.readAndDispatch())
 				display.sleep();
 		}
-		if (!(menu.getData() instanceof MenuManager)) {
+		if (!menu.isDisposed() && !(menu.getData() instanceof MenuManager)) {
 			menu.dispose();
 		}
 	}