From 20b656b16d850fbc1a90e754c208dc8555d66807 Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Tue, 12 Sep 2017 17:26:52 +1200
Subject: [PATCH] - Fixed a bug in new customize dialog. - Chat should work
 correctly when pressing enter now.

tags : #story[1245]
---
 .../java/seng302/visualiser/controllers/LobbyController.java   | 1 +
 .../seng302/visualiser/controllers/RaceViewController.java     | 3 +--
 .../controllers/dialogs/BoatCustomizeController.java           | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/seng302/visualiser/controllers/LobbyController.java b/src/main/java/seng302/visualiser/controllers/LobbyController.java
index 5fe2d0e1..e0d7d3ab 100644
--- a/src/main/java/seng302/visualiser/controllers/LobbyController.java
+++ b/src/main/java/seng302/visualiser/controllers/LobbyController.java
@@ -128,6 +128,7 @@ public class LobbyController implements Initializable {
         BoatCustomizeController controller = dialog.getController();
 
         controller.setParentController(this);
+        controller.setPlayerColor(this.playersColor);
 
         return customizationDialog;
     }
diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
index 452b5823..87235ca7 100644
--- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java
+++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java
@@ -727,8 +727,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     }
 
     public boolean isChatInputFocused() {
-//        return chatInput.focusedProperty().getValue();
-        return false;
+        return chatInput.focusedProperty().getValue();
     }
 
     public String readChatInput() {
diff --git a/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java b/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java
index c59f672a..16afa1e9 100644
--- a/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java
+++ b/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java
@@ -43,8 +43,6 @@ public class BoatCustomizeController implements Initializable{
             submitCustomization();
         });
 
-        setPlayerColor(lobbyController.playersColor);
-
         socketThread = ViewManager.getInstance().getGameClient().getServerThread();
 
         RequiredFieldValidator playerNameReqValidator = new RequiredFieldValidator();