From: Kostas Papadimitriou <kpap@grnet.gr>
Date: Fri, 22 Jun 2012 13:42:22 +0000 (+0300)
Subject: Merge branch 'master' into packaging
X-Git-Tag: v0.9.2^0
X-Git-Url: https://code.grnet.gr/git/pithos-web-client/commitdiff_plain/fe72cfc5afedf0c546dfba465b8c403b31fbbc99?hp=a5f5da3c46fd2c2673c91dde9d00d9dd846e5c9f

Merge branch 'master' into packaging
---

diff --git a/src/gr/grnet/pithos/web/client/FileUploadDialog.java b/src/gr/grnet/pithos/web/client/FileUploadDialog.java
index 0e3ccfe..141d4ba 100644
--- a/src/gr/grnet/pithos/web/client/FileUploadDialog.java
+++ b/src/gr/grnet/pithos/web/client/FileUploadDialog.java
@@ -363,8 +363,13 @@ public class FileUploadDialog extends DialogBox {
 	private native void clearUploader() /*-{
 		var uploader = $wnd.$("#uploader").pluploadQueue();
 		var files = uploader.files;
-		while (files.length > 0)
-			uploader.removeFile(files[0]);
+		var clear = true;
+		for (var i=0; i<files.length; i++)
+			if (files[i].status == $wnd.plupload.UPLOADING)
+				clear = false;
+		if (clear)
+			while (files.length > 0)
+				uploader.removeFile(files[0]);
 	}-*/;
 	
 	native void setGlobalDropArea() /*-{