diff options
| author | Andrey Loskutov | 2015-02-08 20:28:06 +0000 |
|---|---|---|
| committer | Dani Megert | 2015-02-19 14:29:50 +0000 |
| commit | 681a940be7d8b5d62f2961cb856e65a6f01f853b (patch) | |
| tree | d24e803ee0d7f105c42c1607eac81fe2f44e652e | |
| parent | 23748ba665160ecbd52d90faabb18d881a836ed7 (diff) | |
| download | eclipse.platform.ui-681a940be7d8b5d62f2961cb856e65a6f01f853b.tar.gz eclipse.platform.ui-681a940be7d8b5d62f2961cb856e65a6f01f853b.tar.xz eclipse.platform.ui-681a940be7d8b5d62f2961cb856e65a6f01f853b.zip | |
Bug 413329 - NPE in CustomizePerspectiveDialog in createMenuEntries
Don't create menu entries for if contribution item is missing.
Change-Id: Icfbe5d60c814d03032552a1ff28598662466b072
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
| -rw-r--r-- | bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java index 5d8c16b3c10..e8b11d9f15b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/CustomizePerspectiveDialog.java @@ -1944,6 +1944,9 @@ public class CustomizePerspectiveDialog extends TrayDialog { } else { contributionItem = menuMngrRenderer.getContribution(menuItem); } + if (contributionItem == null) { + return dynamicEntry; + } if (dynamicEntry != null && contributionItem.equals(dynamicEntry.getIContributionItem())) { // If the last item added is the item meant to go before the |