Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r1085752ee44b8a6482a2a5784d09e36e693d7a7a -rf1bf8d8992a77c8671086ea6ddfdbe01b3ec141c
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 1085752ee44b8a6482a2a5784d09e36e693d7a7a)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision f1bf8d8992a77c8671086ea6ddfdbe01b3ec141c)
@@ -52,7 +52,7 @@
    
     public function activityClick(ca:Object):Void{
 		_canvasModel.selectedItem = null;
-	   Debugger.log('activityClick CanvasActivity:'+ca.activity.activityUIID + ' orderID: ' + ca.activity.orderID,Debugger.GEN,'activityClick','CanvasController');
+	    Debugger.log('activityClick CanvasActivity:'+ca.activity.activityUIID + ' orderID: ' + ca.activity.orderID,Debugger.GEN,'activityClick','CanvasController');
 	    Debugger.log('Check if transition tool active :'+_canvasModel.isTransitionToolActive(),Debugger.GEN,'activityClick','CanvasController');
 	   //if transition tool active
 	    if(_canvasModel.isTransitionToolActive()){
@@ -94,7 +94,8 @@
    
 	public function activityDoubleClick(ca:Object):Void{
 	   Debugger.log('activityDoubleClick CanvasActivity:'+ca.activity.activityUIID,Debugger.GEN,'activityDoubleClick','CanvasController');
-	    _canvasModel.selectedItem = ca;
+	    _canvasModel.getCanvas().stopActiveTool();
+		_canvasModel.selectedItem = ca;
 		if(ca.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE){
 			_canvasModel.openToolActivityContent(ca.activity);
 		}else{
@@ -104,7 +105,8 @@
    
     public function activityRelease(ca:Object):Void{
 	   Debugger.log('activityRelease CanvasActivity:'+ca.activity.activityUIID,Debugger.GEN,'activityRelease','CanvasController');
-	   
+	    _canvasModel.getCanvas().stopActiveTool();
+		 
 	    if(_canvasModel.isDragging){
 			ca.stopDrag();
 			//if we are on the bin - trash it
@@ -116,7 +118,7 @@
 					_canvasModel.removeComplexActivity(ca);
 				}
 				//_canvasModel.removeActivity(ca.activity.activityUIID);
-				_canvasModel.getCanvas().removeActivity(ca.activity.activityUIID);
+				_canvasModel.getCanvas().removeActivity(ca.activity.activityUIID);
 				//_canvasModel.setDirty();
 			}
 			
@@ -151,22 +153,22 @@
 				//if we are on the optional Activity remove this activity from canvas and assign it a parentID of optional activity and place it in the optional activity window.
 				for (var i=0; i<optionalOnCanvas.length; i++){
 					//trace ("testing Optional on Canvas "+i)
-					if (ca.activity.activityUIID != optionalOnCanvas[i].activity.activityUIID ){
+					if (ca.activity.activityUIID != optionalOnCanvas[i].activity.activityUIID ){
 						if (ca.hitTest(optionalOnCanvas[i])){
 							if (optionalOnCanvas[i].locked == true){
 								var msg:String = Dictionary.getValue('act_lock_chk');
 								LFMessage.showMessageAlert(msg);
-							}else{
-								if (ca.activity.isGateActivity()){
-									ca._x = ca.activity.xCoord;
-									ca._y = ca.activity.yCoord;
-									var msg:String = Dictionary.getValue('cv_gateoptional_hit_chk');
-									LFMessage.showMessageAlert(msg);
+							}else{
+								if (ca.activity.isGateActivity()){
+									ca._x = ca.activity.xCoord;
+									ca._y = ca.activity.yCoord;
+									var msg:String = Dictionary.getValue('cv_gateoptional_hit_chk');
+									LFMessage.showMessageAlert(msg);
 								}else {
-									_canvasModel.addParentToActivity(optionalOnCanvas[i].activity.activityUIID, ca)
+									_canvasModel.addParentToActivity(optionalOnCanvas[i].activity.activityUIID, ca)
 								}
 							}						
-						}
+						}
 						
 					}
 				}
@@ -263,12 +265,15 @@
    
    public function transitionDoubleClick(ct:CanvasTransition):Void{
 	   Debugger.log('transitionDoubleClick CanvasTransition:'+ct.transition.transitionUIID,Debugger.GEN,'transitionDoubleClick','CanvasController');
+	   
+	   _canvasModel.getCanvas().stopActiveTool();
 	   
 	   //TODO: fix this, its null
 	   _canvasView =  CanvasView(getView());
-	   Debugger.log('_canvasView:'+_canvasView,Debugger.GEN,'transitionDoubleClick','CanvasController');
+	   Debugger.log('_canvasView:'+_canvasView,Debugger.GEN,'transitionDoubleClick','CanvasController');
 	   _canvasView.createTransitionPropertiesDialog("centre",Delegate.create(this, transitionPropertiesOK));
-	   
+	  
+		
 	    _canvasModel.selectedItem = ct;
    }