[client] Beef up file chooser, better UI feedback on allowed options

1 files changed, 14 insertions, 2 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java
index ad2511ce..d6855f5a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java
@@ -2,6 +2,8 @@ package org.openslx.dozmod.thrift;
 
 import java.awt.Component;
 
+import javax.swing.SwingUtilities;
+
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.thrift.iface.AuthorizationError;
@@ -14,7 +16,7 @@ import org.openslx.dozmod.gui.helper.MessageType;
 
 public class ThriftError {
 
-	public static void showMessage(Component parent, Logger logger, TException ex, String messageText) {
+	public static void showMessage(final Component parent, Logger logger, TException ex, String messageText) {
 		if (ex instanceof TNotFoundException) {
 			messageText += "\n\nNicht gefunden";
 		} else if (ex instanceof TAuthorizationException) {
@@ -28,7 +30,17 @@ public class ThriftError {
 			messageText += "\n\nUnerwartete Ausnahme " + ex.getClass().getSimpleName() + " ist aufgetreten.";
 		}
 		logger.warn("A thrift call raised an exception", ex);
-		Gui.showMessageBox(parent, messageText, MessageType.ERROR, null, null);
+		if (SwingUtilities.isEventDispatchThread()) {
+			Gui.showMessageBox(parent, messageText, MessageType.ERROR, null, null);
+			return;
+		}
+		final String msg = messageText;
+		Gui.asyncExec(new Runnable() {
+			@Override
+			public void run() {
+				Gui.showMessageBox(parent, msg, MessageType.ERROR, null, null);
+			}
+		});
 	}
 
 	public static String getString(AuthorizationError error) {