mirror of
https://github.com/MGislv/NekoX.git
synced 2024-07-04 11:13:36 +00:00
Fix: invoke virtual method on null object when toggling WS proxy too fast
This commit is contained in:
parent
e45913c40b
commit
64b9d411cb
|
@ -920,21 +920,31 @@ public class SharedConfig {
|
||||||
@Override
|
@Override
|
||||||
public void start() {
|
public void start() {
|
||||||
if (loader != null) return;
|
if (loader != null) return;
|
||||||
loader = new WsLoader();
|
synchronized (this)
|
||||||
port = ProxyManager.mkPort();
|
{
|
||||||
loader.init(bean, port);
|
loader = new WsLoader();
|
||||||
loader.start();
|
port = ProxyManager.mkPort();
|
||||||
|
loader.init(bean, port);
|
||||||
if (SharedConfig.proxyEnabled && SharedConfig.currentProxy == this) {
|
loader.start();
|
||||||
ConnectionsManager.setProxySettings(true, address, port, username, password, secret);
|
if (SharedConfig.proxyEnabled && SharedConfig.currentProxy == this) {
|
||||||
|
ConnectionsManager.setProxySettings(true, address, port, username, password, secret);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void stop() {
|
public void stop() {
|
||||||
if (loader == null) return;
|
if (loader == null) return;
|
||||||
loader.stop();
|
ConnectionsManager.setProxySettings(false, address, port, username, password, secret);
|
||||||
loader = null;
|
UIUtil.runOnIoDispatcher(() -> {
|
||||||
|
synchronized (this)
|
||||||
|
{
|
||||||
|
if (loader == null)
|
||||||
|
return;
|
||||||
|
loader.stop();
|
||||||
|
loader = null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue
Block a user