michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Terminating client thread before server thread to prevent alert box popping up

Browse Source
This commit is contained in:
Zhi You Tan
2017-08-14 11:21:33 +12:00
parent 9b7f4a93d8
commit c77adf385e
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/ClientToServerThread.java
-2
View File
@@ -157,14 +157,12 @@ public class ClientToServerThread implements Runnable {
} catch (ByteReadException e) { } catch (ByteReadException e) {
e.printStackTrace(); e.printStackTrace();
closeSocket(); closeSocket();
if (Platform.isFxApplicationThread()) {
Platform.runLater(() -> { Platform.runLater(() -> {
Alert alert = new Alert(AlertType.ERROR); Alert alert = new Alert(AlertType.ERROR);
alert.setHeaderText("Host has disconnected"); alert.setHeaderText("Host has disconnected");
alert.setContentText("Cannot find Server"); alert.setContentText("Cannot find Server");
alert.showAndWait(); alert.showAndWait();
}); });
}
clientLog(e.getMessage(), 1); clientLog(e.getMessage(), 1);
return; return;
} }
src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
+1 -1
View File
@@ -71,8 +71,8 @@ public class RegularPacketsTest {
@After @After
public void teardown () throws Exception { public void teardown () throws Exception {
serverThread.terminate();
clientThread.setSocketToClose(); clientThread.setSocketToClose();
serverThread.terminate();
GameState.setCurrentStage(GameStages.LOBBYING); GameState.setCurrentStage(GameStages.LOBBYING);
for (int i = 0; i<20; i++) for (int i = 0; i<20; i++)
SleepThreadMaxDelay(); //Make sure socket is closed and toolkit remade. SleepThreadMaxDelay(); //Make sure socket is closed and toolkit remade.