diff options
| author | Jonathan Bauer | 2016-05-04 18:21:47 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2016-05-04 18:21:47 +0200 |
| commit | 2420003d435ba1800c6ec0874c08bef1c1cd9a7a (patch) | |
| tree | 288c9058f308d16fd719ac3bd223b1f7244d6419 /dozentenmodul/src/main/java/org/openslx/dozmod/App.java | |
| parent | [client] only switch to 'Advanced' tab if its input fields contain errors (diff) | |
| download | tutor-module-2420003d435ba1800c6ec0874c08bef1c1cd9a7a.tar.gz tutor-module-2420003d435ba1800c6ec0874c08bef1c1cd9a7a.tar.xz tutor-module-2420003d435ba1800c6ec0874c08bef1c1cd9a7a.zip | |
[client] publish image stuff 2.0
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/App.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/App.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java index 97384ab0..01fcf515 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java @@ -131,16 +131,6 @@ public class App { setupLogger(); - if (Config.getProxyMode() == ProxyMode.AUTO) { - // Initialize the proxy settings - proxyThread = new Thread() { - @Override - public void run() { - ProxyConfigurator.init(); - } - }; - proxyThread.start(); - } // Setup swing style System.setProperty("awt.useSystemAAFontSettings", "on"); @@ -171,6 +161,18 @@ public class App { } // remember masterserver host masterServerHost = host; + // now start the proxy + if (Config.getProxyMode() == ProxyMode.AUTO) { + // Initialize the proxy settings + proxyThread = new Thread() { + @Override + public void run() { + ProxyConfigurator.init(); + } + }; + proxyThread.start(); + } + // SSL if (useSsl) { try { SSLContext ctx = SSLContext.getInstance("TLSv1.2"); |