Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as,v
diff -u -r1.28 -r1.29
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	21 Oct 2008 03:08:58 -0000	1.28
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	12 Mar 2009 06:14:37 -0000	1.29
@@ -410,8 +410,15 @@
 	private function checkIfBranchActive():Void {
 		for(var i=0; i<children_mc.length; i++) {
 			var learnerAct = children_mc[i];
-			if((learnerAct.isAttempted || learnerAct.isCompleted) && children_mc[i].activity.isBranchingActivity())
-				activeSequence = null;			// Possibly closing any other open sequence if a branching activity is active. TODO: review.
+			if((learnerAct.isAttempted || learnerAct.isCompleted) && learnerAct.activity.isBranchingActivity()) {
+				
+				if(!(model.findParent(learnerAct.activity, activeSequence))) {
+					activeSequence =  null;			// Possibly closing any other open sequence if a branching activity is active. TODO: review.
+				}
+				
+				if (_root.mode != 'preview' && isLearnerModule())
+					activeSequence = null;
+			}
 		}
 	}
 	
@@ -455,7 +462,7 @@
 				// check children of sequence (level 1) for current activity
 				if(model.checkComplexHasCurrentActivity(children_mc[i].activity, learner) && (children_mc[i].activity != activeSequence))
 					removeAllChildrenAndInputSequence(children_mc[i].activity, false);
-			} else if(isChildAttempted && (children_mc[i].activity.isOptionsWithSequencesActivity() || children_mc[i].activity.isOptionalActivity() || children_mc[i].activity.isParallelActivity())) {
+			} else if(isChildAttempted && (children_mc[i].activity.isOptionsWithSequencesActivity() || children_mc[i].activity.isOptionalActivity() || children_mc[i].activity.isParallelActivity() || (children_mc[i].activity.isBranchingActivity() && (_root.mode == 'preview')))) {
 				if(model.checkComplexHasCurrentActivity(children_mc[i].activity, learner) && (children_mc[i].activity != activeComplex))
 					removeAllChildrenAndInputComplex(children_mc[i].activity, children_mc[i].level, false);
 			}
Index: lams_learning/web/lams_learner.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/lams_learner.swf,v
diff -u -r1.111 -r1.112
Binary files differ
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring.swf,v
diff -u -r1.236 -r1.237
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.204 -r1.205
Binary files differ