1 files changed, 18 insertions, 11 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index d8e7f797..4be287d7 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -255,19 +255,26 @@ public abstract class MainWindow {
 				@Override
 				public void fire() {
 					App.waitForInit();
-					// now try to init the session with the saved configuration (by giving it null)
-					if (ThriftActions.initSession(null, false, SwingUtilities.getWindowAncestor(mainWindow))) {
-						initWindow();
-					} else {
-						// session resume failed, so do the normal login procedure
-						Gui.asyncExec(new Runnable() {
-							@Override
-							public void run() {
-								LoginWindow.open(mainWindow);
+					Gui.syncExec(new GuiCallable<Boolean>() {
+						@Override
+						public Boolean run() {
+							// now try to init the session with the saved configuration (by giving it null)
+							if (ThriftActions.initSession(null, false,
+									SwingUtilities.getWindowAncestor(mainWindow))) {
 								initWindow();
+							} else {
+								// session resume failed, so do the normal login procedure
+								Gui.asyncExec(new Runnable() {
+									@Override
+									public void run() {
+										LoginWindow.open(mainWindow);
+										initWindow();
+									}
+								});
 							}
-						});
-					}
+							return null;
+						}
+					});
 				}
 			});
 		}