nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-26 18:30:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add shutdown hook to ensure system proxy is unregistered

Browse Source
This commit is contained in:
UnfamiliarLegacy 2021-11-26 20:07:42 +01:00
parent 09105e956b
commit cc7dece9a4
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
G-Earth/src/main/java/gearth/protocol/connection/proxy/nitro/http/NitroHttpProxy.java
View File

@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class NitroHttpProxy { public class NitroHttpProxy {
private static final String ADMIN_WARNING_KEY = "admin_warning_dialog"; private static final String ADMIN_WARNING_KEY = "admin_warning_dialog";
private static final AtomicBoolean SHUTDOWN_HOOK = new AtomicBoolean();
private final Authority authority; private final Authority authority;
private final NitroOsFunctions osFunctions; private final NitroOsFunctions osFunctions;
@ -89,6 +90,8 @@ public class NitroHttpProxy {
} }
public boolean start() { public boolean start() {
setupShutdownHook();
try { try {
proxyServer = DefaultHttpProxyServer.bootstrap() proxyServer = DefaultHttpProxyServer.bootstrap()
.withPort(NitroConstants.HTTP_PORT) .withPort(NitroConstants.HTTP_PORT)
@ -133,4 +136,18 @@ public class NitroHttpProxy {
proxyServer.stop(); proxyServer.stop();
proxyServer = null; proxyServer = null;
} }
/**
* Ensure the system proxy is removed when G-Earth exits.
* Otherwise, users might complain that their browsers / discord stop working when closing G-Earth incorrectly.
*/
private static void setupShutdownHook() {
if (SHUTDOWN_HOOK.get()) {
return;
}
if (SHUTDOWN_HOOK.compareAndSet(false, true)) {
Runtime.getRuntime().addShutdownHook(new Thread(() -> NitroOsFunctionsFactory.create().unregisterSystemProxy()));
}
}
} }