summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
diff options
context:
space:
mode:
authorGrant Gayed <ggayed>2004-11-09 20:18:12 +0000
committerGrant Gayed <ggayed>2004-11-09 20:18:12 +0000
commit8968349d435b50e7e9b767b21358ae7415a04cfe (patch)
treec584d43156003efdfdeed9501d6123d81b27b29c /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
parent0492caaa990e2a1e35c43057d7e9911c25655227 (diff)
downloadeclipse.platform.swt-8968349d435b50e7e9b767b21358ae7415a04cfe.tar.gz
eclipse.platform.swt-8968349d435b50e7e9b767b21358ae7415a04cfe.tar.xz
eclipse.platform.swt-8968349d435b50e7e9b767b21358ae7415a04cfe.zip
*** empty log message ***
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
index 1dcf9bf5bc..5ffd0e87c7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java
@@ -285,9 +285,10 @@ public int getAccelerator () {
int /*long*/ getAccelGroup () {
Menu menu = parent;
- while (menu.cascade != null) {
+ while (menu != null && menu.cascade != null) {
menu = menu.cascade.parent;
}
+ if (menu == null) return 0;
Decorations shell = menu.parent;
return shell.menuBar == menu ? shell.accelGroup : 0;
}