Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as,v
diff -u -r1.19 -r1.20
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	7 Mar 2008 06:39:29 -0000	1.19
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	31 Mar 2008 05:19:13 -0000	1.20
@@ -485,7 +485,7 @@
 		var isVisible:Boolean = (visible == null) ? true : visible;
 		
 		var target:MovieClip = monitorModel.activeView.branchContent;
-		var _branchView_mc:MovieClip = target.createChildAtDepth("canvasBranchView", DepthManager.kTop, {_x: cx, _y: cy, _canvasBranchingActivity:ba, _open:isVisible});	
+		var _branchView_mc:MovieClip = target.createChildAtDepth("canvasBranchView", DepthManager.kTop, {_x: cx, _y: cy, _canvasBranchingActivity:ba, _open:isVisible, _prevActiveView: monitorModel.activeView});	
 		var branchView:CanvasBranchView = CanvasBranchView(_branchView_mc);
 		
 		branchView.init(monitorModel, monitorView.getController());
@@ -504,14 +504,18 @@
 		monitorModel.openBranchingActivities.push(ba.activity.activityUIID);
 	}
 	
-	public function closeBranchView() {
+	public function closeBranchView(prevActiveView) {
 		var parentBranching:CanvasActivity = null;
 		var isCBV:Boolean = false;
 		
 		if(monitorModel.activeView.activity.parentUIID != null) 
 			parentBranching = CanvasActivity(monitorModel.activitiesDisplayed.get(_ddm.getActivityByUIID(monitorModel.activeView.activity.parentUIID).parentUIID));
 
-		monitorModel.activeView = (parentBranching.activity.isBranchingActivity()) ? parentBranching.activity.branchView : monitorView.getMonitorTabView();
+		if(prevActiveView != null)
+			monitorModel.activeView = prevActiveView;
+		else
+			monitorModel.activeView = (parentBranching.activity.isBranchingActivity()) ? parentBranching.activity.branchView : monitorView.getMonitorTabView();
+		
 		monitorModel.currentBranchingActivity = (parentBranching.activity.isBranchingActivity()) ? parentBranching : null;
 		
 		var poppedActivityUIID:Number = monitorModel.openBranchingActivities.pop();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as,v
diff -u -r1.36 -r1.37
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	7 Mar 2008 06:09:55 -0000	1.36
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	31 Mar 2008 05:19:13 -0000	1.37
@@ -1080,6 +1080,7 @@
 		Debugger.log("visible: " + visible, Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
 		
 		if(ba.activity.branchView != null) {
+			ba.activity.branchView.prevActiveView = activeView;
 			activeView = (visible) ? ba.activity.branchView : activeView;
 			ba.activity.branchView.setOpen(visible);
 			ba.activity.branchView.open();
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring.swf,v
diff -u -r1.185 -r1.186
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring_library.swf,v
diff -u -r1.153 -r1.154
Binary files differ