Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2019-02-10 12:49:01 -0500
committerAndrey Loskutov2019-02-10 13:59:02 -0500
commit519101cc5434bb0e60c6aab46466dd29bb1cadb9 (patch)
tree037f66708f693f135a83cea7f43826dd9ba839e0 /org.eclipse.debug.ui/ui
parent30bc5ed5d34b0854931ee5a96b6269132e2b3755 (diff)
downloadeclipse.platform.debug-519101cc5434bb0e60c6aab46466dd29bb1cadb9.tar.gz
eclipse.platform.debug-519101cc5434bb0e60c6aab46466dd29bb1cadb9.tar.xz
eclipse.platform.debug-519101cc5434bb0e60c6aab46466dd29bb1cadb9.zip
Bug 544313 - NPE on workbench close if debug view in foregroundI20190212-1800I20190211-1800I20190210-2135I20190210-1800
Change-Id: I057c371f8280482636a5ffa9f618d2afbaf4b46f Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.debug.ui/ui')
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java
index a6a251df0..c319e00bb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contexts/DebugWindowContextService.java
@@ -118,6 +118,10 @@ public class DebugWindowContextService implements IDebugContextService, IPartLis
if (index >= 0) {
fProvidersByPartId.remove( getCombinedPartId(provider.getPart()) );
fProviders.remove(index);
+ if (fWindow != null && fWindow.isClosing()) {
+ provider.removeDebugContextListener(this);
+ return;
+ }
IDebugContextProvider activeProvider = getActiveProvider();
if (index == 0) {
if (activeProvider != null) {

Back to the top