| commit | e938dcc5e6ba338d20b13d8a722079f571760496 | [log] [tgz] |
|---|---|---|
| author | Daniel Rolka <daniel.rolka@pl.ibm.com> | Mon Aug 25 15:03:48 2014 +0200 |
| committer | Daniel Rolka <daniel.rolka@pl.ibm.com> | Wed Sep 03 06:23:53 2014 -0400 |
| tree | bf294b3a5a70e9d3e02737aac4b28c5a5f6fb4fa | |
| parent | 40d9d22977c6f744db5582da4cc11b86c5e8bc45 [diff] |
Bug 348429 - [Perspectives] [Compare] NPE in ContentMergeViewerLayout.layout Change-Id: I5653b7a5e227be353dca43f719605356986f5f5f Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.java index 183345d..aae000d 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.java +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.java
@@ -254,6 +254,21 @@ engine.removeGui(menu); } } - super.disposeWidget(element); + + Composite parent = null; + if (element.getWidget() instanceof Composite) { + parent = ((Composite) element.getWidget()).getParent(); + } + + if (parent != null) { + try { + parent.setRedraw(false); + super.disposeWidget(element); + } finally { + parent.setRedraw(true); + } + } else { + super.disposeWidget(element); + } } }