[client] Fix several issues with the new upload scheme

1 files changed, 8 insertions, 6 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java
index 056e5f71..dbc42b16 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java
@@ -53,12 +53,14 @@ public abstract class TransferTask implements Runnable {
 		while (!isCancelled && !Thread.interrupted()) {
 			TransferEvent event = getTransferEvent();
 			if (event != null) {
-				fireEvent(event);
-				if (event.state == TransferState.ERROR) {
-					break;
-				}
 				if (event.state == TransferState.FINISHED) {
 					isComplete = true;
+				}
+				if (event.state == TransferState.ERROR) {
+					isCancelled = true;
+				}
+				fireEvent(event);
+				if (event.state == TransferState.ERROR || event.state == TransferState.FINISHED) {
 					break;
 				}
 			}
@@ -96,8 +98,8 @@ public abstract class TransferTask implements Runnable {
 
 	private void fireEvent(TransferEvent event) {
 		synchronized (listeners) {
-			for (TransferEventListener listener : listeners) {
-				listener.update(event);
+			for (int i = listeners.size() - 1; i >= 0; --i) {
+				listeners.get(i).update(event);
 			}
 		}
 	}