1
0
mirror of https://github.com/MGislv/NekoX.git synced 2024-07-02 10:33:36 +00:00

Fix: invoke virtual method on null object when toggling WS proxy too fast

This commit is contained in:
luvletter2333 2021-04-18 01:34:47 +08:00
parent e45913c40b
commit 64b9d411cb
No known key found for this signature in database
GPG Key ID: BFD68B892BECC1D8

View File

@ -920,21 +920,31 @@ public class SharedConfig {
@Override
public void start() {
if (loader != null) return;
loader = new WsLoader();
port = ProxyManager.mkPort();
loader.init(bean, port);
loader.start();
if (SharedConfig.proxyEnabled && SharedConfig.currentProxy == this) {
ConnectionsManager.setProxySettings(true, address, port, username, password, secret);
synchronized (this)
{
loader = new WsLoader();
port = ProxyManager.mkPort();
loader.init(bean, port);
loader.start();
if (SharedConfig.proxyEnabled && SharedConfig.currentProxy == this) {
ConnectionsManager.setProxySettings(true, address, port, username, password, secret);
}
}
}
@Override
public void stop() {
if (loader == null) return;
loader.stop();
loader = null;
ConnectionsManager.setProxySettings(false, address, port, username, password, secret);
UIUtil.runOnIoDispatcher(() -> {
synchronized (this)
{
if (loader == null)
return;
loader.stop();
loader = null;
}
});
}
@Override