| commit | df4ae3de868779fcdf44049b1662ece3ba11fa12 | [log] [tgz] |
|---|---|---|
| author | Stefan Xenos <sxenos@gmail.com> | Wed Nov 16 16:41:35 2016 -0800 |
| committer | Stefan Xenos <sxenos@gmail.com> | Thu Nov 17 14:09:14 2016 -0400 |
| tree | ed6e7841d70e5ef4ed62b6acba02d1cb401b80c7 | |
| parent | b7f3ffa65ea1e763726db5578d97d0ac7df76130 [diff] |
Bug 507632 - Exception in ThemeElementHelper prevents Eclipse startup. Change-Id: I5304fbf3034113b14fd8b8a8263ece3c6eaaf856 Signed-off-by: Stefan Xenos <sxenos@gmail.com>
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementHelper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementHelper.java index 88d7248..9d5dc90 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementHelper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementHelper.java
@@ -323,10 +323,12 @@ prefColor = definition.getValue(); } else if (definition.getDefaultsTo() != null) { prefColor = registry.getRGB(definition.getDefaultsTo()); - } else { - prefColor = defaultColor; } - } + } + + if (prefColor == null) { + prefColor = defaultColor; + } if (setInRegistry) { registry.put(id, prefColor);