summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
diff options
context:
space:
mode:
authorStephan Schwaer2015-09-14 18:28:19 +0200
committerStephan Schwaer2015-09-14 18:28:19 +0200
commit5bd71e253153113a2bf3c87d22d79b8c6f7a96c1 (patch)
tree0278701ee5437a89db2292e9a864cd4a31dd7dba /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
parent[client] space between info text and checkboxes (diff)
downloadtutor-module-5bd71e253153113a2bf3c87d22d79b8c6f7a96c1.tar.gz
tutor-module-5bd71e253153113a2bf3c87d22d79b8c6f7a96c1.tar.xz
tutor-module-5bd71e253153113a2bf3c87d22d79b8c6f7a96c1.zip
[client] Added selection of satellite when more than one available. Shift key to force selection not working yet.
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java3
1 files changed, 2 insertions, 1 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 47fc0178..7aefa1ec 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
@@ -15,6 +15,7 @@ import java.util.List;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
import org.apache.log4j.Logger;
import org.apache.thrift.TBaseHelper;
@@ -336,7 +337,7 @@ public class LoginWindow extends LoginWindowLayout {
// Update known suggested fingerprints
importFingerprints(data.satellites);
// now try to init the session with the data received
- if (ThriftActions.initSession(data)) {
+ if (ThriftActions.initSession(data, SwingUtilities.getWindowAncestor(this))) {
if (saveUsernameCheck.isSelected()) {
Config.saveCurrentSession(Session.getSatelliteAddress(), Session.getSatelliteToken(),
Session.getMasterToken());