Index: lams_central/web/lams_authoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v
diff -u -r1.486 -r1.487
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring_library.swf,v
diff -u -r1.386 -r1.387
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as,v
diff -u -r1.82 -r1.83
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	21 Oct 2008 03:09:00 -0000	1.82
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	29 Oct 2008 23:21:36 -0000	1.83
@@ -572,11 +572,11 @@
 			var branchesArray:Array = _cv.ddm.branches.values();
 			
 			for(var i=0;i<branchesArray.length;i++){
-				if(branchesArray[i].targetUIID == toAct && !branchesArray[i].isActivityless){
+				if(branchesArray[i].targetUIID == toAct && branchesArray[i].hubUIID == fromAct && !branchesArray[i].isActivityless){ // Have to check both end points
 					return new LFError(Dictionary.getValue("cv_invalid_branch_target_to_activity", [_connectionActivities[1].title]));
 				}
 				
-				if(branchesArray[i].targetUIID == fromAct && !branchesArray[i].isActivityless) {
+				if(branchesArray[i].targetUIID == fromAct && branchesArray[i].hubUIID == toAct && !branchesArray[i].isActivityless) {
 					if(!SequenceActivity(branchesArray[i].sequenceActivity).stopAfterActivity && (fromAct != activeView.startHub))
 						return new LFError(Dictionary.getValue("cv_invalid_branch_target_from_activity", [_connectionActivities[0].title]));
 				}