diff options
| author | Jens Kübler | 2012-12-17 19:45:53 +0000 |
|---|---|---|
| committer | Paul Webster | 2012-12-17 19:45:53 +0000 |
| commit | c4c9b9c6cd031d5bd96a5b85a44fb8e498725184 (patch) | |
| tree | a3c4bd9eacb0812ebdd12c0768f25b956a966285 | |
| parent | c0f2460ad104162529a5ac10f55e3ced5d7a75b1 (diff) | |
| download | eclipse.platform.ui-c4c9b9c6cd031d5bd96a5b85a44fb8e498725184.tar.gz eclipse.platform.ui-c4c9b9c6cd031d5bd96a5b85a44fb8e498725184.tar.xz eclipse.platform.ui-c4c9b9c6cd031d5bd96a5b85a44fb8e498725184.zip | |
Bug 337636 - NPE with extensibleSpashHandler extension
initialize SharedImages if it's not already done.
| -rw-r--r-- | bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java index 01179ab059f..03c0b512c59 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java @@ -645,6 +645,12 @@ public class WorkbenchPlugin extends AbstractUIPlugin { * @return the shared image manager */ public ISharedImages getSharedImages() { + if(sharedImages == null) { + sharedImages = new SharedImages(); + } + if(e4Context == null) { + return sharedImages; + } return (ISharedImages) e4Context.get(ISharedImages.class.getName()); } |