From 357fef86725ef2e5ac5bc4498018fefeeff12f4d Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Fri, 20 Jul 2018 15:59:05 +0800
Subject: [PATCH] Call initProxy() manually

---
 .../java/org/jackhuang/hmcl/setting/ProxyManager.java     | 8 ++------
 .../main/java/org/jackhuang/hmcl/setting/Settings.java    | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ProxyManager.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ProxyManager.java
index 8f8972ff5..b856bd4ca 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ProxyManager.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ProxyManager.java
@@ -36,7 +36,7 @@ public final class ProxyManager {
     private ProxyManager() {
     }
 
-    private static final ObjectBinding<Proxy> proxyProperty = Bindings.createObjectBinding(
+    private static ObjectBinding<Proxy> proxyProperty = Bindings.createObjectBinding(
             () -> {
                 String host = CONFIG.getProxyHost();
                 Integer port = Lang.toIntOrNull(CONFIG.getProxyPort());
@@ -59,11 +59,7 @@ public final class ProxyManager {
         return proxyProperty;
     }
 
-    static {
-        initProxy();
-    }
-
-    private static void initProxy() {
+    static void init() {
         proxyProperty.addListener(observable -> updateSystemProxy());
 
         updateSystemProxy();
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java
index 4d7fc951f..7d34525ee 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java
@@ -66,7 +66,7 @@ public class Settings {
         firstLaunch = CONFIG.isFirstLaunch();
         CONFIG.setFirstLaunch(false);
 
-        ProxyManager.getProxy(); // init ProxyManager
+        ProxyManager.init();
 
         for (Iterator<Map<Object, Object>> iterator = CONFIG.getAccounts().iterator(); iterator.hasNext();) {
             Map<Object, Object> settings = iterator.next();