[client] dont go into the vip area if closing login window

2 files changed, 11 insertions, 2 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
index 594eba07..82c372c5 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
@@ -8,6 +8,9 @@ import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -15,6 +18,7 @@ import java.util.List;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.DefaultListCellRenderer;
+import javax.swing.JFrame;
 import javax.swing.JList;
 
 import org.apache.log4j.Logger;
@@ -70,7 +74,13 @@ public class LoginWindow extends LoginWindowLayout {
 	public LoginWindow(Frame modalParent) {
 		// call the constructor of the superclass
 		super(modalParent);
-
+		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e) {
+				Gui.exit(0);
+			}
+		});
 		// first do all listeners stuff
 		for (final LOGIN_TYPE type : LOGIN_TYPE.values()) {
 			loginTypes[type.id].setActionCommand(type.toString());
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
index 0654e448..3fa8d55a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
@@ -81,7 +81,6 @@ public abstract class LoginWindowLayout extends JDialog {
 	public LoginWindowLayout(Frame modalParent) {
 		super(modalParent, TITLE, ModalityType.APPLICATION_MODAL);
     	setResizable(false);
-    	setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
     	GridBagLayout bag = new GridBagLayout();
     	GridBagConstraints con = new GridBagConstraints();
     	setLayout(bag);