Bug 390921 - InjectionException when using Context-Menu
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.java
index 1451741..f4d21bf 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.java
@@ -847,15 +847,15 @@
}
} else {
modelChildren.add(childModel);
- if (childModel instanceof MPopupMenu) {
- if (((MPopupMenu) childModel).getContext() == null) {
- IEclipseContext lclContext = getContext(menuModel);
- if (lclContext != null) {
- ((MPopupMenu) childModel)
- .setContext(lclContext
- .createChild(childModel
- .getElementId()));
- }
+ }
+ if (childModel instanceof MPopupMenu) {
+ if (((MPopupMenu) childModel).getContext() == null) {
+ IEclipseContext lclContext = getContext(menuModel);
+ if (lclContext != null) {
+ ((MPopupMenu) childModel)
+ .setContext(lclContext
+ .createChild(childModel
+ .getElementId()));
}
}
}
