Tidy up closing logic
This commit is contained in:
parent
e362a6af75
commit
c38fe6b322
@ -323,7 +323,9 @@ public class Main {
|
|||||||
running = false;
|
running = false;
|
||||||
if(Globals.server != null){
|
if(Globals.server != null){
|
||||||
Globals.server.close();
|
Globals.server.close();
|
||||||
Globals.serverThread.interrupt();
|
if(Globals.serverThread != null){
|
||||||
|
Globals.serverThread.interrupt();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
//shut down audio engine
|
//shut down audio engine
|
||||||
if(!Globals.HEADLESS && Globals.RUN_CLIENT){
|
if(!Globals.HEADLESS && Globals.RUN_CLIENT){
|
||||||
|
|||||||
@ -76,7 +76,9 @@ public class Server implements Runnable{
|
|||||||
|
|
||||||
public void close(){
|
public void close(){
|
||||||
try {
|
try {
|
||||||
serverSocket.close();
|
if(serverSocket != null){
|
||||||
|
serverSocket.close();
|
||||||
|
}
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user