Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -rd065d513d8d620f940a0adb75935ebc5553cc276 -rb40e4c230f8a3da407404dc14d08bba5ac2062e2 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision d065d513d8d620f940a0adb75935ebc5553cc276) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision b40e4c230f8a3da407404dc14d08bba5ac2062e2) @@ -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 =================================================================== diff -u -r7fb6b41326c14398bde6d88690e65ebd166a1e44 -rb40e4c230f8a3da407404dc14d08bba5ac2062e2 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 7fb6b41326c14398bde6d88690e65ebd166a1e44) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision b40e4c230f8a3da407404dc14d08bba5ac2062e2) @@ -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 =================================================================== diff -u -r5c5d0dde4257f652d199b84921bf1182260bf959 -rb40e4c230f8a3da407404dc14d08bba5ac2062e2 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 5c5d0dde4257f652d199b84921bf1182260bf959) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision b40e4c230f8a3da407404dc14d08bba5ac2062e2) @@ -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 =================================================================== diff -u -r5fefd3b780ff75bde980f11184db78e39a9f5fc1 -rb40e4c230f8a3da407404dc14d08bba5ac2062e2 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r5fefd3b780ff75bde980f11184db78e39a9f5fc1 -rb40e4c230f8a3da407404dc14d08bba5ac2062e2 Binary files differ