| commit | 6695be530b70c006aaff262e79112ba9b52c0e84 | [log] [tgz] |
|---|---|---|
| author | Eric Moffatt <emoffatt> | Fri Jun 10 19:31:17 2011 +0000 |
| committer | Eric Moffatt <emoffatt> | Fri Jun 10 19:31:17 2011 +0000 |
| tree | 586cb5dd170a34e0723ab39c70686b003b56fd83 | |
| parent | b5162db0a6b97dc86b3aae81e2a5f5e56c5b71ee [diff] |
Fix for Bug 349076 - NPE thrown when trying to close parts after merging detached stacks
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java index c8c9bbe..923da1d 100644 --- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java +++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java
@@ -558,7 +558,7 @@ MUIElement parent = kid.getParent(); if (parent == null && kid.getCurSharedRef() != null) parent = kid.getCurSharedRef().getParent(); - if (parent != element) + if (!(element instanceof MPlaceholder) && parent != element) continue; if (c.getContext() != null