Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as,v
diff -u -r1.8 -r1.9
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	21 Feb 2008 07:37:24 -0000	1.8
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	7 Mar 2008 02:48:55 -0000	1.9
@@ -327,13 +327,19 @@
 					Debugger.log('parent :'+this._parent._parent, Debugger.CRITICAL,'onRelease','LearnerActivity');
 					
 					var activeSequence = LearnerComplexActivity(this._parent._parent).getActiveSequence();
+					Debugger.log('activeSequence:'+activeSequence, Debugger.CRITICAL,'onRelease','LearnerActivity');
+					
 					if(activeSequence == this.activity) {
 						// close current active sequence
 						LearnerComplexActivity(this._parent._parent).removeAllChildrenAndInputSequence(null);
 					} else {
 						// open sequence
 						LearnerComplexActivity(this._parent._parent).removeAllChildrenAndInputSequence(this.activity);
 					}
+				} else if(this.activity.isBranchingActivity()) {
+					Debugger.log("hitting branching: " + this.activity.activityUIID, Debugger.CRITICAL,'onRelease','LearnerActivity');
+					
+					
 				}
 				
 				controller.activityRelease(this);
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.12 -r1.13
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	5 Mar 2008 07:09:58 -0000	1.12
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	7 Mar 2008 02:48:55 -0000	1.13
@@ -187,8 +187,10 @@
 			count++;
 			
 			if(learnerAct.activity == activeSequence) {
-				var actOrder:Array = model.getDesignOrder(activeSequence.firstActivityUIID, false);
-				drawChildren(actOrder, container, count);
+				if(activeSequence.firstActivityUIID != null) {
+					var actOrder:Array = model.getDesignOrder(activeSequence.firstActivityUIID, true);
+					drawChildren(actOrder, container, count);
+				}
 			}
 		}
 		
@@ -295,7 +297,7 @@
 		activeSequence = activity;
 		redrawComplex();
 		
-		if(!locked) { 
+		if(!locked && isLearnerModule()) { 
 			localOnPress();
 			localOnRelease();
 		}
@@ -304,6 +306,7 @@
 	private function redrawComplex():Void {
 		removeAllChildren();
 		drawChildren(_children, children_mc);
+		
 		MovieClipUtils.doLater(Proxy.create(this, draw));
 	}
 	
@@ -434,10 +437,10 @@
 		Debugger.log ('_doubleClicking:' + _doubleClicking + ', localOnRelease:' + this, Debugger.GEN, 'localOnRelease', 'LearnerOptionalActivity');
 			if (_locked && !_doubleClicking){
 				collapse();
-				controller.complexActivityRelease(this, _doubleClicking);
+				if(isLearnerModule()) controller.complexActivityRelease(this, _doubleClicking);
 			} else {
 				expand();
-				controller.complexActivityRelease(this,_doubleClicking);
+				if(isLearnerModule()) controller.complexActivityRelease(this,_doubleClicking);
 			}
 	}
 	
Index: lams_learning/web/lams_learner.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/lams_learner.swf,v
diff -u -r1.79 -r1.80
Binary files differ