Index: lams_central/web/lams_authoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v
diff -u -r1.465 -r1.466
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.365 -r1.366
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as,v
diff -u -r1.53 -r1.54
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	20 Jun 2008 06:15:04 -0000	1.53
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	4 Jul 2008 06:47:24 -0000	1.54
@@ -374,7 +374,7 @@
 	 * @param   branchUIID 
 	 * @return  
 	 */
-	public function removeBranch(branchUIID):Object{
+	public function removeBranch(branchUIID, doSaveMappings:Boolean):Object{
 		//dispatch an event to show the design has changed
 		dispatchEvent({type:'ddmBeforeUpdate',target:this});
 		
@@ -387,7 +387,8 @@
 				var mappings:Object = getBranchMappingsByActivityUIIDAndType(r.sequenceActivity.activityUIID)
 				Debugger.log("removing " + mappings.length + " entries", Debugger.GEN, "removeBranch", "DesignDataModel");
 				
-				removeEntries(mappings.all);
+				if(!doSaveMappings)
+					removeEntries(mappings.all);
 			}
 			
 			Debugger.log('Removed:'+r.branchUIID,Debugger.GEN,'removeBranch','DesignDataModel');
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as,v
diff -u -r1.11 -r1.12
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as	20 Jun 2008 06:15:46 -0000	1.11
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as	4 Jul 2008 06:47:24 -0000	1.12
@@ -206,7 +206,7 @@
 		for(var i=0; i<branchingToClear.length; i++) {
 			// clearing opened branching views
 			Debugger.log("clearing branching view: " + branchingToClear[i].activity.activityUIID, Debugger.CRITICAL, "close", "CanvasComplexView");
-			model.clearBranchingActivity(branchingToClear[i]);
+			model.clearBranchingActivity(branchingToClear[i], true);
 		}
 		
 		if(_tempActivity instanceof CanvasOptionalActivity)
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as,v
diff -u -r1.33 -r1.34
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	23 Jun 2008 06:11:59 -0000	1.33
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	4 Jul 2008 06:47:24 -0000	1.34
@@ -1054,7 +1054,7 @@
 		}
 	}
 	
-	public function clearBranchingActivity(ca:Object):Void {
+	public function clearBranchingActivity(ca:Object, doSaveMappings:Boolean):Void {
 		
 			haltRefresh(true);
 			
@@ -1070,7 +1070,7 @@
 				else
 					removeActivity(c[i].activityUIID);
 					
-				clearBranches(c[i].activityUIID);
+				clearBranches(c[i].activityUIID, doSaveMappings);
 			}
 			
 			CanvasBranchView(ca.activity.branchView).removeMovieClip();
@@ -1081,15 +1081,15 @@
 				
 	}
 	
-	public function clearBranches(seqUIID:Number):Void {
+	public function clearBranches(seqUIID:Number, doSaveMappings:Boolean):Void {
 		var b:Object = _cv.ddm.getBranchesForActivityUIID(seqUIID);
 		for(var j=0; j<b.myBranches.length; j++) {
 			Debugger.log("br: " + b.myBranches[j].branchUIID, Debugger.CRITICAL, "clearBranches", "CanvasSuperModel");
 			
 			var r = branchesDisplayed.remove(b.myBranches[j].branchUIID);
 			r.removeMovieClip();
 				
-			_cv.ddm.removeBranch(b.myBranches[j].branchUIID);
+			_cv.ddm.removeBranch(b.myBranches[j].branchUIID, doSaveMappings);
 				
 		}
 	}