Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -rff2972a8beab68dd02e0e2ff755bad44996ecae2 -r8fc224b5073b8210e5e73cbfc6eed4e661bff04d
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision ff2972a8beab68dd02e0e2ff755bad44996ecae2)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 8fc224b5073b8210e5e73cbfc6eed4e661bff04d)
@@ -234,21 +234,26 @@
 	 * @return  
 	 */
 	public function activityDoubleClick(ca:Object):Void{
-	   Debugger.log('activityDoubleClick CanvasActivity:'+ca.activity.activityUIID,Debugger.GEN,'activityDoubleClick','CanvasController');
-	    
+	   Debugger.log('activityDoubleClick CanvasActivity:'+ca.activity.activityUIID,Debugger.CRITICAL,'activityDoubleClick','CanvasController');
+	    var parentAct = _canvasModel.getCanvas().ddm.getActivityByUIID(ca.activity.parentUIID)
 		_canvasModel.getCanvas().stopActiveTool();
-			
+		_canvasModel.getCanvas().stopTransitionTool();	
 		if(_canvasModel.getCanvas().ddm.readOnly){
 			// throw alert warning
 			LFMessage.showMessageAlert(Dictionary.getValue('cv_activity_dbclick_readonly'));
 		}else{
 			_canvasModel.selectedItem = ca;
-			if(ca.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE){
-				_canvasModel.openToolActivityContent(ca.activity);
-			}else if(ca.activity.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.SYNCH_GATE_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.SCHEDULE_GATE_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PERMISSION_GATE_ACTIVITY_TYPE){
+			if(ca.activity.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.SYNCH_GATE_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.SCHEDULE_GATE_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PERMISSION_GATE_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
 				if (!_pi.isPIExpanded()){
 					_canvasModel.setPIHeight(_pi.piFullHeight());
 				}
+			}else if (ca.activity.parentUIID != null && parentAct.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE && (ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE)){
+				if (!_pi.isPIExpanded()){
+					_canvasModel.setPIHeight(_pi.piFullHeight());
+				}
+			}else{
+				Debugger.log('activityDoubleClick CanvasActivity:'+ca.activity.activityUIID,Debugger.CRITICAL,'activityDoubleClick to open Content','CanvasController');
+				_canvasModel.openToolActivityContent(ca.activity);
 			}
 		}
 		_canvasModel.getCanvas().ddm.validDesign = false;
@@ -304,10 +309,12 @@
 				_canvasModel.getCanvas().stopTransitionTool();
 				if(td instanceof LFError){
 					_canvasModel.resetTransitionTool();
-					//_canvasModel.getCanvas().stopTransitionTool();
+					_canvasModel.getCanvas().stopTransitionTool();
 					LFMessage.showMessageAlert(td);
 				}
 			}
+			_canvasModel.resetTransitionTool();
+			_canvasModel.getCanvas().stopActiveTool();
 			_canvasModel.getCanvas().stopTransitionTool();