From 9bb7a1acbce64e85d18393c3249ce3c41275b32f Mon Sep 17 00:00:00 2001
From: Tomasz Zarna
Date: Fri, 18 Apr 2008 09:11:32 +0000
Subject: bug 227565: NPE in TeamAction.dispose() on shutdown

---
 .../src/org/eclipse/team/internal/ui/actions/TeamAction.java          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java
index b308dc343..fffc6743e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java
@@ -432,7 +432,9 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio
 		super.dispose();
 		if(window != null) {
 			window.getSelectionService().removePostSelectionListener(selectionListener);
-			window.getActivePage().removePartListener(targetPartListener);
+			if (window.getActivePage() != null) {
+				window.getActivePage().removePartListener(targetPartListener);
+			}
 			targetPartListener = null;
 		}
 		// Don't hold on to anything when we are disposed to prevent memory leaks (see bug 195521)
-- 
cgit v1.2.3