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

Merge remote-tracking branch 'origin/Story1247_AutoDiscovery' into NewUI

Browse Source 
# Conflicts:
#	pom.xml
#	src/main/java/seng302/App.java
#	src/main/java/seng302/visualiser/controllers/StartScreenController.java
#	src/main/resources/views/StartScreenView.fxml
This commit is contained in:
Michael Rausch
2017-09-07 16:36:30 +12:00
parent 0feccdc8b9 eb1d3f1a60
commit 8cc725616c
16 changed files with 607 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/GameClient.java
+1
View File
@@ -142,6 +142,7 @@ public class GameClient {
}
private void loadStartScreen() {
socketThread.setSocketToClose();
if (server != null) {
server.terminate();