From 3603b78f540b0ed6f0927465e8a3202ae6acf698 Mon Sep 17 00:00:00 2001
From: Andrey Loskutov
Date: Tue, 23 Apr 2019 00:22:42 +0200
Subject: Bug 498428 - NPE on dispose of RunToLineAction

Change-Id: I9910191e72540dcc9b49647ee4cc174ee174e3e2
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
---
 .../ui/org/eclipse/debug/ui/actions/RunToLineAction.java           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'org.eclipse.debug.ui/ui/org/eclipse/debug')

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineAction.java
index 15c9cf1f2..c8d9667df 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineAction.java
@@ -151,7 +151,12 @@ public class RunToLineAction extends Action implements IUpdate {
 	public void dispose() {
 		IDebugContextManager manager = DebugUITools.getDebugContextManager();
 		if (fActivePart != null) {
-			manager.getContextService(fActivePart.getSite().getWorkbenchWindow()).removeDebugContextListener(fContextListener);
+			IWorkbenchWindow ww = fActivePart.getSite().getWorkbenchWindow();
+			if (ww != null) {
+				manager.getContextService(ww).removeDebugContextListener(fContextListener);
+			} else {
+				manager.removeDebugContextListener(fContextListener);
+			}
 		}
 		fActivePart = null;
 		fTargetElement = null;
-- 
cgit v1.2.3