Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rb7b18e3a982232c1c7f6320107de6b6bcbf7988b -r87ccf050e224a95b1d8c73c3f7a76a1cf86fd568
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rb7b18e3a982232c1c7f6320107de6b6bcbf7988b -r87ccf050e224a95b1d8c73c3f7a76a1cf86fd568
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceController.as
===================================================================
diff -u -ra14258831fcc72b00a6ff5c93654133a620bdc4c -r87ccf050e224a95b1d8c73c3f7a76a1cf86fd568
--- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceController.as	(.../WorkspaceController.as)	(revision a14258831fcc72b00a6ff5c93654133a620bdc4c)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceController.as	(.../WorkspaceController.as)	(revision 87ccf050e224a95b1d8c73c3f7a76a1cf86fd568)
@@ -141,11 +141,14 @@
 		//if this ndoe has children then the 
 		//data has already been got, nothing to do
 		
-		if(!nodeToOpen.hasChildNodes()){
+		if(!nodeToOpen.hasChildNodes() && !_isBusy){
+			setBusy();
 			// DC24-01-06 this resource ID must refer to a folder as its been marked as a branch
 			var resourceToOpen = nodeToOpen.attributes.data.resourceID;
 			//must be a folder ID, depoends if this event is fired for an "open" reousrce click
-			_workspaceModel.openFolderInTree(resourceToOpen, false);
+			_workspaceModel.openFolderInTree(resourceToOpen, false);
+			
+			clearBusy();
 		}else{
 			Debugger.log('nodeToOpen already has children in cache',Debugger.GEN,'onTreeNodeOpen','org.lamsfoundation.lams.WorkspaceController');
 			
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceModel.as
===================================================================
diff -u -r963c11998584f096e27db0f70a47dcd0eaacf72f -r87ccf050e224a95b1d8c73c3f7a76a1cf86fd568
--- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceModel.as	(.../WorkspaceModel.as)	(revision 963c11998584f096e27db0f70a47dcd0eaacf72f)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceModel.as	(.../WorkspaceModel.as)	(revision 87ccf050e224a95b1d8c73c3f7a76a1cf86fd568)
@@ -287,6 +287,9 @@
 			Debugger.log('Did not find:'+dto.resourceType+'_'+dto.workspaceFolderID+' Something bad has happened',Debugger.CRITICAL,'setFolderContents','org.lamsfoundation.lams.WorkspaceModel');
 		}
 		
+		// do not populate folder if already contains contents
+		if(nodeToUpdate.hasChildNodes()) { return; }
+		
 		// sort contents for content folders
 		if(nodeToUpdate.attributes.data.resourceID >= 0) { 
 			dto.contents.sortOn("name", Array.CASEINSENSITIVE);