Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as,v
diff -u -r1.80 -r1.81
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	3 Mar 2008 05:53:40 -0000	1.80
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	7 Mar 2008 06:09:55 -0000	1.81
@@ -728,7 +728,7 @@
 	 * @return  
 	 */
 	private function removeTransition(t:Transition, cm){
-		if(!cm.isActiveView(this)) return false;
+		if(!cm.isActiveView(this) || cm instanceof MonitorModel) return false;
 		
 		var r = cm.transitionsDisplayed.remove(t.transitionUIID);
 		r.removeMovieClip();
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.17 -r1.18
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	5 Mar 2008 23:54:20 -0000	1.17
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	7 Mar 2008 06:09:55 -0000	1.18
@@ -494,8 +494,10 @@
 		ba.activity.branchView = branchView;
 		
 		var actToPush = monitorModel.getMonitor().ddm.getActivityByUIID(ba.activity.activityUIID);
+		
 		Debugger.log("Pushing activity: "+actToPush.title+" to the stack", Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
 		Debugger.log("It has a UIID of: "+actToPush.activityUIID, Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
+		
 		monitorModel.openBranchingActivities.push(ba.activity.activityUIID);
 	}
 	
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.35 -r1.36
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	7 Mar 2008 05:23:25 -0000	1.35
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	7 Mar 2008 06:09:55 -0000	1.36
@@ -1082,7 +1082,8 @@
 		if(ba.activity.branchView != null) {
 			activeView = (visible) ? ba.activity.branchView : activeView;
 			ba.activity.branchView.setOpen(visible);
-			ba.activity.branchView.open();
+			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.30 -r1.31
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	7 Mar 2008 05:23:25 -0000	1.30
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	7 Mar 2008 06:09:55 -0000	1.31
@@ -364,7 +364,7 @@
 	 * @param   activityUIID 
 	 * @return  
 	 */
-	private function removeTransition(t:Transition,mm:MonitorModel){
+	private function removeTransition(t:Transition, mm:MonitorModel){
 		if(!mm.isActiveView(this)) return false;
 		
 		var r = mm.transitionsDisplayed.remove(t.transitionUIID);
@@ -402,8 +402,6 @@
 			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');
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring.swf,v
diff -u -r1.171 -r1.172
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.139 -r1.140
Binary files differ