diff options
| author | Michael Wilson | 2014-10-16 15:21:03 +0200 |
|---|---|---|
| committer | Michael Wilson | 2014-10-16 15:21:03 +0200 |
| commit | 6e9327cb4378280811d65b83d7ca115cd636382e (patch) | |
| tree | 59eaf1b0ea5130d7dc90895a090c61a42631bc98 /dozentenmodul/src/main/java/gui | |
| parent | - (diff) | |
| parent | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff) | |
| download | tutor-module-6e9327cb4378280811d65b83d7ca115cd636382e.tar.gz tutor-module-6e9327cb4378280811d65b83d7ca115cd636382e.tar.xz tutor-module-6e9327cb4378280811d65b83d7ca115cd636382e.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodul/src/main/java/gui/intro/Login_GUI.java
Diffstat (limited to 'dozentenmodul/src/main/java/gui')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/intro/Login_GUI.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index 1c2bbb77..4078d2c5 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -289,6 +289,7 @@ public class Login_GUI extends JFrame { if (loginType == LOGIN_TYPE_BWLEHRPOOL) { + //offline mode in case the masterserver is not reachable. start programm with parameter: offline_mode if(args.length != 0 && args[0].equals("offline_mode")) { SessionData.session.setServerAdress("141.79.128.102"); @@ -307,8 +308,6 @@ public class Login_GUI extends JFrame { server.generated.Server.Client bwClient = bwthrift.getThriftConnection(); models.Client.clientcon.setClient(bwClient); - //showMainMenu(); - } else { |