From fa9d23798e0a93befe684db4c462a1dc6192260d Mon Sep 17 00:00:00 2001
From: Ben Steffensmeier <Benjamin.P.Steffensmeier@raytheon.com>
Date: Wed, 19 Jun 2013 16:33:58 -0500
Subject: [PATCH] Issue #2116 Do not deactivate contexts for parts when closing
 an inactive perspective.

Former-commit-id: 0e6f3ff5e62b2729a0d819edcccd12cd5c509e20 [formerly 0e6f3ff5e62b2729a0d819edcccd12cd5c509e20 [formerly 7a73d0897230c0a33d4be153e9ebbf9477b3e829]]
Former-commit-id: 6de9e8609066c52e46e378b901fbf30bfa164032
Former-commit-id: accd308f8b5d9fdee818e8c675595417cff56f6b
---
 .../perspectives/AbstractVizPerspectiveManager.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
index d89efe378f..45ecb543a5 100644
--- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
+++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
@@ -70,9 +70,11 @@ import com.raytheon.viz.ui.tools.ModalToolManager;
  * <pre>
  * SOFTWARE HISTORY
  * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * Jul 22, 2008				randerso	Initial creation
- * Mar 26, 2013	1799      	bsteffen   	Fix pan/zoom when in views.
+ * ------------ ----------  ----------- --------------------------
+ * Jul 22, 2008             randerso    Initial creation
+ * Mar 26, 2013 1799        bsteffen    Fix pan/zoom when in views.
+ * Jun 19, 2013 2116        bsteffen    Do not deactivate contexts for parts
+ *                                      when closing an inactive perspective.
  * 
  * </pre>
  * 
@@ -512,8 +514,9 @@ public abstract class AbstractVizPerspectiveManager implements
 
     protected void deactivateContexts(ContextManager manager) {
         manager.deactivateContexts(this);
-        if (page != null && page.getActivePart() != null) {
-            manager.deactivateContexts(page.getActivePart());
+        if (page != null && page.getActivePart() != null
+                && perspectiveId.equals(page.getPerspective().getId())) {
+                manager.deactivateContexts(page.getActivePart());
         }
     }