Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as,v
diff -u -r1.16 -r1.17
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	27 Feb 2008 04:33:36 -0000	1.16
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	7 Mar 2008 05:23:25 -0000	1.17
@@ -193,6 +193,7 @@
 		_defineLater = false;
 		_readOnly = false;
 		_createDateTime = new Date();
+		_branchView = null;
 		
 	}
 	
@@ -789,12 +790,12 @@
 			return null;
 	}
 	
-	public function get branchView():CanvasBranchView {
-		return _branchView;
+	public function get branchView():MovieClip {
+		return (_branchView instanceof CanvasBranchView) ? _branchView : null;
 	}
 	
-	public function set branchView(a:CanvasBranchView):Void {
-		_branchView = a;
+	public function set branchView(a:MovieClip):Void {
+		_branchView = (a != null) ? CanvasBranchView(a) : null;
 	}
 	
 }
\ No newline at end of file
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.34 -r1.35
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	7 Mar 2008 02:49:58 -0000	1.34
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	7 Mar 2008 05:23:25 -0000	1.35
@@ -1078,16 +1078,12 @@
 		if(visible == null) visible = true;
 		
 		Debugger.log("visible: " + visible, Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
-		
+		
 		if(ba.activity.branchView != null) {
 			activeView = (visible) ? ba.activity.branchView : activeView;
-			
-			ba.activity.branchView.setOpen(visible);
-			
+			ba.activity.branchView.setOpen(visible);
 			ba.activity.branchView.open();
-			
 			setDirty();
-			
 		} else { 
 			_monitor.openBranchView(currentBranchingActivity, visible); 
 		}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as,v
diff -u -r1.29 -r1.30
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	26 Feb 2008 00:26:15 -0000	1.29
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	7 Mar 2008 05:23:25 -0000	1.30
@@ -288,9 +288,12 @@
 		else {
 		*/
 			showAssets(true);
-			mm.openBranchingActivity = mm.currentBranchingActivity.activity.activityUIID;
-			mm.getMonitor().closeBranchView();
-		
+			
+			mm.activeView = this;
+			mm.currentBranchingActivity = null;
+			
+			//mm.openBranchingActivity = mm.currentBranchingActivity.activity.activityUIID;
+			
 			//Remove all the movies drawn on the transition and activity movieclip holder
 			
 			this._learnerContainer_mc.removeMovieClip();
@@ -398,6 +401,9 @@
 			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
 			newActivity_mc = activityLayer.createChildAtDepth("CanvasOptionalActivity", DepthManager.kTop, {_activity:a, _children:children, _monitorController:mc, _monitorTabView:mtv, fromModuleTab:"monitorMonitorTab", learnerContainer:_learnerContainer_mc});	
 		} else if(a.isBranchingActivity()){
+			a.branchView = null;
+			Debugger.log("setting branchView null: " + a.branchView,Debugger.CRITICAL,'drawActivity','MonitorTabView');
+		
 			newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity", DepthManager.kBottom, {_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc, setupBranchView:false});
 		} else {
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','MonitorTabView');