Tidy up closing logic

This commit is contained in:
austin 2023-07-20 21:34:43 -04:00
parent e362a6af75
commit c38fe6b322
2 changed files with 6 additions and 2 deletions

View File

@ -323,8 +323,10 @@ public class Main {
running = false; running = false;
if(Globals.server != null){ if(Globals.server != null){
Globals.server.close(); Globals.server.close();
if(Globals.serverThread != null){
Globals.serverThread.interrupt(); Globals.serverThread.interrupt();
} }
}
//shut down audio engine //shut down audio engine
if(!Globals.HEADLESS && Globals.RUN_CLIENT){ if(!Globals.HEADLESS && Globals.RUN_CLIENT){
Globals.audioEngine.shutdown(); Globals.audioEngine.shutdown();

View File

@ -76,7 +76,9 @@ public class Server implements Runnable{
public void close(){ public void close(){
try { try {
if(serverSocket != null){
serverSocket.close(); serverSocket.close();
}
} catch (IOException ex) { } catch (IOException ex) {
ex.printStackTrace(); ex.printStackTrace();
} }