Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java
index 584e3935f..e24431296 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugContextManager.java
@@ -146,6 +146,10 @@ public class DebugContextManager implements IDebugContextManager {
protected IDebugContextService createService(IWorkbenchWindow window) {
DebugWindowContextService service = fServices.get(window);
if (service == null) {
+ if (window == null) {
+ // the window has been closed - return a dummy service
+ return NULL_SERVICE;
+ }
IEvaluationService evaluationService = window.getService(IEvaluationService.class);
if (window.getShell() == null || evaluationService == null) {
// the window has been closed - return a dummy service

Back to the top