| commit | ade1a9849ee4de1065eadb4ce01d89377fe98ff5 | [log] [tgz] |
|---|---|---|
| author | Chris McLaren <cmclaren> | Mon Jul 14 20:17:37 2003 +0000 |
| committer | Chris McLaren <cmclaren> | Mon Jul 14 20:17:37 2003 +0000 |
| tree | c2c6172a7d6358647e45f7c8351317d566d4a8a4 | |
| parent | 467273a8fdeddd3a5041a14ac3d2100dca9d3b3d [diff] |
*** empty log message ***
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ContextAndHandlerManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ContextAndHandlerManager.java index 7577884..a33cb74 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ContextAndHandlerManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/commands/ContextAndHandlerManager.java
@@ -309,7 +309,12 @@ return; if (acceleratorMenu == null || acceleratorMenu.isDisposed()) { - Menu parent = workbenchWindow.getShell().getMenuBar(); + Shell shell = workbenchWindow.getShell(); + + if (shell == null || shell.isDisposed()) + return; + + Menu parent = shell.getMenuBar(); if (parent == null || parent.isDisposed() || parent.getItemCount() < 1) return;