diff options
| author | Jonathan Bauer | 2015-09-16 14:47:13 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-09-16 14:47:13 +0200 |
| commit | cf17139567fbc4ec29dea2368a465423f6408ff2 (patch) | |
| tree | b523893480271a8fb378383c61b8b7e1f0a8c4d0 /dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java | |
| parent | [client] SatListWindow: Fix formating (diff) | |
| download | tutor-module-cf17139567fbc4ec29dea2368a465423f6408ff2.tar.gz tutor-module-cf17139567fbc4ec29dea2368a465423f6408ff2.tar.xz tutor-module-cf17139567fbc4ec29dea2368a465423f6408ff2.zip | |
[client] SatList: fix NPE if user closes SatListW
added nullcheck for generating radio button so that we can call it with null to force/fake a manual IP input field
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java index b67b41b9..5a6f4566 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java @@ -109,7 +109,6 @@ public class ThriftActions { MessageType.ERROR, LOGGER, null); return false; } - // TODO: Show list if > 1 // Satellite sat = data.satellites.get(0); Satellite sat = null; if (data.satellites.size() == 1 && !LoginWindow.forceCustomSatellite) { @@ -118,7 +117,7 @@ public class ThriftActions { sat = SatelliteListWindow.open(window , data.satellites); } - if (sat.addressList == null) { + if (sat == null || sat.addressList == null) { // TODO: Ask for manual IP address entry Gui.asyncMessageBox( "Login erfolgreich, aber es wurde kein Satelliten-Server ausgewählt.\n" |