| commit | 8451535d79a435f2ba16ffaf6a4d3bec91829309 | [log] [tgz] |
|---|---|---|
| author | Karsten Thoms <karsten.thoms@karakun.com> | Fri Jun 12 08:29:21 2020 +0200 |
| committer | Karsten Thoms <karsten.thoms@karakun.com> | Fri Jun 12 04:00:06 2020 -0400 |
| tree | 817100ed600b35e86f60a8fc4277dcf22e684b77 | |
| parent | 88655f1e7609ce2f5a58c4d3e9b00facd85f9dea [diff] |
Bug 564224 - Add null guard getShell() might return null. Change-Id: I9b7361d6fbbe711c9113048129587104113b9531 Signed-off-by: Karsten Thoms <karsten.thoms@karakun.com>
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java index e4c9624..b1cd69b 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
@@ -2998,7 +2998,10 @@ MTrimBar topTrim = getTopTrim(); if (topTrim != null) { topTrim.setVisible(isToolbarVisible()); - getShell().layout(); + Shell shell = getShell(); + if (shell != null && !shell.isDisposed()) { + shell.layout(); + } } }