Bug 532317 - Return Workbench display in getDisplay
When the workbench is shut down, e.g. due to an unsuccessful start, then
the active workbench window's shell is already set to null. It is safer
to return the Workbench's Display.
Change-Id: I6d5b1a951b557faff0aff50bf19dc7482fbccee9
Signed-off-by: Karsten Thoms <karsten.thoms@karakun.com>
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistory.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistory.java
index ab40169..c88dc7a 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistory.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/NavigationHistory.java
@@ -175,7 +175,7 @@
}
private Display getDisplay() {
- return page.getWorkbenchWindow().getShell().getDisplay();
+ return Workbench.getInstance().getDisplay();
}
private boolean isPerTabHistoryEnabled() {
