| commit | 80b6b0a7a778bcdfdbed0fbf6b39d8b2626df3fb | [log] [tgz] |
|---|---|---|
| author | Andrey Loskutov <loskutov@gmx.de> | Sun Feb 10 17:44:57 2019 +0100 |
| committer | Andrey Loskutov <loskutov@gmx.de> | Sun Feb 10 17:44:57 2019 +0100 |
| tree | 293ef0b9a00b7fee2531580737b6912cc3ddf77c | |
| parent | eaf49f82571a0caa3380fca6e70a1b07ff9e06b3 [diff] |
Bug 543746 - fixed NPE after control dispose Change-Id: If7c4590ab46d5fb8371005c1e7933dead8ef90eb Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/helpers/EmptyWorkspaceHelper.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/helpers/EmptyWorkspaceHelper.java index fc6f331..dec8c0d 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/helpers/EmptyWorkspaceHelper.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/helpers/EmptyWorkspaceHelper.java
@@ -276,7 +276,7 @@ }; private boolean switchTopControl() { - if (control.isDisposed() || emptyArea.isDisposed()) { + if (control == null || control.isDisposed() || emptyArea == null || emptyArea.isDisposed()) { return false; } Control oldTop = layout.topControl;