Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as,v
diff -u -r1.18 -r1.19
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	11 Feb 2008 23:26:54 -0000	1.18
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	14 Feb 2008 22:46:29 -0000	1.19
@@ -383,13 +383,15 @@
 	public function activityReleaseOutside(ca:Object):Void{
 	   Debugger.log('activityReleaseOutside CanvasActivity:'+ca.activity.activityID,Debugger.GEN,'activityReleaseOutside','MonitorController');
 	}
-   
+
 	public function activityDoubleClick(ca:Object, forTabView:String, learnerID:Number, fromContextMenu:Boolean):Void{
 		
 		Debugger.log("ca.activity.isBranchingActivity(): "+ca.activity.isBranchingActivity(), Debugger.GEN, "activityDoubleClick", "MonitorController");
 		if(ca.activity.isBranchingActivity() && !fromContextMenu) {
-			_monitorModel.openBranchActivityContent(ca, true);
-		} else {
+			if (_monitorModel.getSelectedTab() == MonitorTabView._tabID)
+				_monitorModel.openBranchActivityContent(ca, true);
+		} 
+		if (!fromContextMenu){
 					
 			var _learnerID:Number;
 			var URLToSend:String;
@@ -406,11 +408,11 @@
 				}
 				
 				if (forTabView == "MonitorTabViewLearner"){
-					Debugger.log('activityDoubleClick CanvasActivity:'+ca.activityID,Debugger.GEN,'activityDoubleClick','MonitorController');
 					URLToSend = _root.serverURL+_root.monitoringURL+'getLearnerActivityURL&activityID='+ca.activityID+'&userID='+_learnerID+'&lessonID='+_root.lessonID;
 				}else {
 					URLToSend = _root.serverURL+_root.monitoringURL+'getLearnerActivityURL&activityID='+ca.activity.activityID+'&userID='+_learnerID+'&lessonID='+_root.lessonID;
-				}
+				}	
+				Debugger.log('activityDoubleClick CanvasActivity:'+ca.activityID,Debugger.GEN,'activityDoubleClick','MonitorController');
 			}
 
 			Debugger.log('Opening url (ca.activityID) :'+URLToSend+" Opening url (ca.activityID)"+URLToSend,Debugger.CRITICAL,'openToolActivityContent','MonitorModel');
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring.swf,v
diff -u -r1.154 -r1.155
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.122 -r1.123
Binary files differ