Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
===================================================================
diff -u -re3aef7ebcf8ea4fcf581d5f5588b17001c3b8482 -rbae98916a64235a485e77c6361422e88079ba10d
--- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision e3aef7ebcf8ea4fcf581d5f5588b17001c3b8482)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision bae98916a64235a485e77c6361422e88079ba10d)
@@ -731,23 +731,21 @@
 		
 		Debugger.log('_workspaceModel.currentMode: ' + _workspaceModel.currentMode,Debugger.GEN,'ok','org.lamsfoundation.lams.WorkspaceDialog');
 		var tempTitle = StringUtils.replace(resourceTitle_txi.text, " ", "");
-		if (tempTitle == "" || tempTitle == undefined){
-			Cursor.showCursor(ApplicationParent.C_DEFAULT);
-			
-			var sendMsg:String = Dictionary.getValue('ws_file_name_empty')+"\n"+Dictionary.getValue('ws_entre_file_name')+"\n\n";
-			LFMessage.showMessageAlert(sendMsg,null);
-			_workspaceController.clearBusy();
-			resourceTitle_txi.setFocus();
-		}else{
-			
-			if(_workspaceModel.currentMode=="SAVE" || _workspaceModel.currentMode=="SAVEAS"){
+		if(_workspaceModel.currentMode=="SAVE" || _workspaceModel.currentMode=="SAVEAS"){
+			if (tempTitle == "" || tempTitle == undefined){
+				Cursor.showCursor(ApplicationParent.C_DEFAULT);
+				
+				var sendMsg:String = Dictionary.getValue('ws_file_name_empty')+"\n"+Dictionary.getValue('ws_entre_file_name')+"\n\n";
+				LFMessage.showMessageAlert(sendMsg,null);
+				_workspaceController.clearBusy();
+				resourceTitle_txi.setFocus();
+			}else{
 				Cursor.showCursor(ApplicationParent.C_HOURGLASS);
 				saveFile(snode);
-			} else {
-				openFile(snode);
 			}
-		}
-			
+		} else {
+			openFile(snode);
+		}			
     }
 	
 	/**
@@ -758,12 +756,15 @@
 	
 	private function openFile(snode:XMLNode):Void{
 		Debugger.log('Opening a file.',Debugger.GEN,'openFile','org.lamsfoundation.lams.WorkspaceDialog');
+		_workspaceController = _workspaceView.getController();
+		
 		if (snode.attributes.data.resourceType==_workspaceModel.RT_FOLDER){
 			if(resourceTitle_txi.text == null){
-				LFMessage.showMessageAlert(Dictionary.getValue('ws_click_file_open'),null);
+				//LFMessage.showMessageAlert(Dictionary.getValue('ws_click_file_open'),null);
 			} else {
 				if(!searchForFile(snode, resourceTitle_txi.text)){
-					LFMessage.showMessageAlert(Dictionary.getValue('ws_no_file_open'),null);
+					//LFMessage.showMessageAlert(Dictionary.getValue('ws_no_file_open'),null);
+				_workspaceController.clearBusy()	
 				}
 			}
 		} else {
@@ -848,7 +849,7 @@
 	
 	public function receivedFolderContents(dto:Object){
 		_workspaceModel.setFolderContents(dto, false);
-		
+		_workspaceController = _workspaceView.getController();
 		if(_workspaceModel.getWorkspaceResource('Folder_'+dto.workspaceFolderID)!=null){
 			if(_workspaceModel.currentMode == Workspace.MODE_SAVE || _workspaceModel.currentMode == Workspace.MODE_SAVEAS){
 				if(searchForFile(_workspaceModel.getWorkspaceResource('Folder_'+dto.workspaceFolderID), _resultDTO.resourceName)){
@@ -857,7 +858,8 @@
 				}
 			} else {
 				if(!searchForFile(_workspaceModel.getWorkspaceResource('Folder_'+dto.workspaceFolderID), _resultDTO.resourceName)){
-					LFMessage.showMessageAlert(Dictionary.getValue('ws_no_file_open'),null);
+					//LFMessage.showMessageAlert(Dictionary.getValue('ws_no_file_open'),null);
+					_workspaceController.clearBusy()
 				}
 			}
 		}