[client] Fix bwLehrstuhl

1 files changed, 7 insertions, 4 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 b8ea83d2..496c1e25 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -152,26 +152,29 @@ public abstract class MainWindow {
 		registerPage(new MainMenuWindow());
 		//registerPage(new ImageListWindow());
 		//registerPage(new LectureListWindow());
-		// Show main menu by default
-		showPage(MainMenuWindow.class);
 
 		// center the window on the primary monitor
 		mainWindow.getContentPane().add(mainContainer, BorderLayout.CENTER);
 		mainWindow.setVisible(true);
+
 		Gui.centerShell(mainWindow);
 		Gui.limitShellSize(mainWindow);
-
+		
 		// here we can check for Session information
 		if (Session.getSatelliteToken() != null) {
 			// Wait for proxy server init
 			App.waitForInit();
 			// TODO: Try to resume session
 		}
+
 		// Session resume probably failed, show login window
 		if (Session.getSatelliteToken() == null) {
 			// User did not login, show the login mask
-			LoginWindow.open();
+			LoginWindow.open(mainWindow);
 		}
+		
+		// Show main menu by default
+		showPage(MainMenuWindow.class);
 	}
 
 	/**