Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r39146ee7d65129e500c4778b5c69268a997cece9 -r27d85ee30520b52c79e0b44ca00a475bf57a1de2
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r39146ee7d65129e500c4778b5c69268a997cece9 -r27d85ee30520b52c79e0b44ca00a475bf57a1de2
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r5b44cd0646c0ee06e57059948a5d5f730040f431 -r27d85ee30520b52c79e0b44ca00a475bf57a1de2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 5b44cd0646c0ee06e57059948a5d5f730040f431)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 27d85ee30520b52c79e0b44ca00a475bf57a1de2)
@@ -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
===================================================================
diff -u -r5b44cd0646c0ee06e57059948a5d5f730040f431 -r27d85ee30520b52c79e0b44ca00a475bf57a1de2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as	(.../CanvasComplexView.as)	(revision 5b44cd0646c0ee06e57059948a5d5f730040f431)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as	(.../CanvasComplexView.as)	(revision 27d85ee30520b52c79e0b44ca00a475bf57a1de2)
@@ -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
===================================================================
diff -u -r415c9b00b59f525e4f5154d23f24e8d39300a76f -r27d85ee30520b52c79e0b44ca00a475bf57a1de2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 415c9b00b59f525e4f5154d23f24e8d39300a76f)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 27d85ee30520b52c79e0b44ca00a475bf57a1de2)
@@ -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);
 				
 		}
 	}