Merge branches 'master' and 'storyD-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into storyD-3D

2017-09-04 14:00:20 +12:00
parent 0ee448e17d e8977eb0c4
commit 35c595adf8
42 changed files with 1724 additions and 538 deletions
@@ -71,8 +71,10 @@ public class FinishController extends Controller {


        //Winner label.
-        raceWinnerLabel.setText("Winner: "+ boatNameColumn.getCellObservableValue(0).getValue());
-        raceWinnerLabel.setWrapText(true);
+        if (boats.size() > 0) {
+            raceWinnerLabel.setText("Winner: " + boatNameColumn.getCellObservableValue(0).getValue());
+            raceWinnerLabel.setWrapText(true);
+        }

    }