| commit | 40ffef101aae6a9a1b7679c1edb682e2e9462b52 | [log] [tgz] |
|---|---|---|
| author | Eric Moffatt <emoffatt@ca.ibm.com> | Fri May 18 14:54:35 2012 -0400 |
| committer | Eric Moffatt <emoffatt@ca.ibm.com> | Fri May 18 14:54:35 2012 -0400 |
| tree | 055be4028268f21d14213a8e4ae93084e2a65b8e | |
| parent | 93645981af2852e8951a40a073ebf8afea76af95 [diff] |
Safe up 'getOverrideImage' for Bug 379791
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java index b5d830f..b3558c6 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java
@@ -151,7 +151,8 @@ Object imageObject = element.getTransientData().get( IPresentationEngine.OVERRIDE_ICON_IMAGE_KEY); - if (imageObject != null && imageObject instanceof Image) + if (imageObject != null && imageObject instanceof Image + && !((Image) imageObject).isDisposed()) result = (Image) imageObject; return result; }