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.14 -r1.15 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as 20 Feb 2008 02:59:45 -0000 1.14 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as 25 Feb 2008 06:52:15 -0000 1.15 @@ -511,6 +511,7 @@ var poppedActivityUIID:Number = monitorModel.openBranchingActivities.pop(); var poppedActivity = monitorModel.getMonitor().ddm.getActivityByUIID(poppedActivityUIID); + Debugger.log("Closing branching activity: "+poppedActivity.title, Debugger.CRITICAL, "closeBranchView", "Monitor"); Debugger.log("It had a UIID of: "+poppedActivityUIID, Debugger.CRITICAL, "openBranchActivityContent", "Monitor"); } 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.29 -r1.30 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as 25 Feb 2008 04:18:02 -0000 1.29 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as 25 Feb 2008 06:52:15 -0000 1.30 @@ -1086,7 +1086,7 @@ ba.branchView.open(); - setDirty(); + //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.27 -r1.28 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as 25 Feb 2008 06:36:05 -0000 1.27 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as 25 Feb 2008 06:52:15 -0000 1.28 @@ -373,10 +373,12 @@ * @param cm - Refernce to the model * @return Boolean - successfullit */ - private function drawActivity(a:Activity,mm:MonitorModel):Boolean{ + private function drawActivity(a:Activity, mm:MonitorModel):Boolean{ var mtv = MonitorTabView(this); var mc = getController(); var newActivity_mc = null; + + if(!mm.isActiveView(this)) return false; Debugger.log("activityTypeID: " + a.activityTypeID,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.164 -r1.165 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.132 -r1.133 Binary files differ