Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as,v
diff -u -r1.6 -r1.7
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as	29 Oct 2007 05:17:34 -0000	1.6
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as	30 Oct 2007 01:42:09 -0000	1.7
@@ -325,7 +325,10 @@
 			Debugger.log("seq children length: " + children.length, Debugger.CRITICAL, "orderDesign", "LessonModel");
 		
 			for(var i=0; i<children.length; i++) {
-				if(!orderDesignChildren(children, i, order, false)) return false;
+				if(!orderDesignChildren(children, i, order, false)) {
+					broadcastViewUpdate("REMOVE_ACTIVITY_ALL");
+					return false;
+				}
 			}
 		}
 		
@@ -355,14 +358,14 @@
 			if(_root.mode != 'preview') {
 				if(!backtrack) order.pop();
 				
-				if(!orderDesign(firstActivitySeq, order, backtrack)) return false;
-				if(children[i].stopAfterActivity && !backtrack) return false;
-				
-				if(_activeSeq[children[i].parentUIID] == null) {
+				if(_activeSeq[children[i].parentUIID] == null && _progressStr == "current_mc") {
 					_activeSeq[children[i].parentUIID] = Activity(children[i]);
 					broadcastViewUpdate("REMOVE_ACTIVITY_ALL");
 				}
 				
+				if(!orderDesign(firstActivitySeq, order, backtrack)) return false;
+				if(children[i].stopAfterActivity && !backtrack) return false;
+				
 			} else {
 				
 				Debugger.log("progress: " + _progressStr + " for id: " + firstActivitySeq.activityID, Debugger.CRITICAL, "orderDesign", "LessonModel");
Index: lams_learning/web/lams_learner.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/lams_learner.swf,v
diff -u -r1.71 -r1.72
Binary files differ