[client] Fix closing upload activity panel

1 files changed, 19 insertions, 15 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java
index 7e56b0e8..0ad07abc 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java
@@ -56,26 +56,30 @@ public class UploadPanel extends TransferPanel implements QuitNotification {
 		state.upload.getUploadTask().addListener(this);
 	}
 
+	/**
+	 * Cancel/Close pressed
+	 */
 	private class ButtonAction implements ActionListener {
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			if (state == null)
-				return;
-			state.getUploadTask().removeListener(panel);
-			if (!state.getUploadTask().isCanceled()) {
-				if (!Gui.showMessageBox(panel, I18n.ACTIVITY.getString("UploadPanel.Message.yesNo.cancelTransfer"),
-						MessageType.QUESTION_YESNO, null, null))
-					return;
-				final UploadInitiator fstate = state;
-				QuickTimer.scheduleOnce(new Task() {
-					@Override
-					public void fire() {
-						fstate.cancelError("UploadPanel: Requested by user through button press");
-					}
-				});
+			if (state != null) {
+				if (!state.getUploadTask().isCanceled()) {
+					if (!Gui.showMessageBox(panel,
+							I18n.ACTIVITY.getString("UploadPanel.Message.yesNo.cancelTransfer"),
+							MessageType.QUESTION_YESNO, null, null))
+						return;
+					final UploadInitiator fstate = state;
+					QuickTimer.scheduleOnce(new Task() {
+						@Override
+						public void fire() {
+							fstate.cancelError("UploadPanel: Requested by user through button press");
+						}
+					});
+				}
+				state.getUploadTask().removeListener(panel);
+				state = null;
 			}
 			close();
-			state = null;
 		}
 	}