AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-14 09:56:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix server deletion, fix null pointer when connection to server failed

Browse Source
This commit is contained in:
Bixilon 2020-09-04 13:57:23 +02:00
parent 195d31adb6
commit 480e5db1ab
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java
View File

@ -241,9 +241,9 @@ public class ServerListCell extends ListCell<Server> implements Initializable {
} }
public void delete() { public void delete() {
listView.getItems().remove(server);
server.delete(); server.delete();
Log.info(String.format("Deleted server (name=\"%s\", address=\"%s\")", server.getName(), server.getAddress())); Log.info(String.format("Deleted server (name=\"%s\", address=\"%s\")", server.getName(), server.getAddress()));
listView.getItems().remove(server);
} }
public void connect() { public void connect() {

2
src/main/java/de/bixilon/minosoft/protocol/network/Network.java
View File

@ -235,7 +235,9 @@ public class Network {
// Could not connect // Could not connect
lastException = e; lastException = e;
connection.setConnectionState(ConnectionStates.FAILED); connection.setConnectionState(ConnectionStates.FAILED);
if (socketSThread != null) {
socketSThread.interrupt(); socketSThread.interrupt();
}
e.printStackTrace(); e.printStackTrace();
} }
}); });