From b034a452b60503dd9696f7968e7fefff59c2e7c0 Mon Sep 17 00:00:00 2001 From: Connor Taylor-Brown Date: Fri, 8 Sep 2017 16:30:03 +1200 Subject: [PATCH] Fixed problem with race pane registering non-control keys #story[1190] --- .../java/visualiser/Controllers/RaceController.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java index a7cf88b3..35e20cb7 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java @@ -224,9 +224,16 @@ public class RaceController extends Controller { }); racePane.addEventFilter(KeyEvent.KEY_PRESSED, e -> { - switch(keyFactory.getKey(e.getCode().toString()).toString()) { - case "Zoom In": view3D.updateDistance(-10); break; - case "Zoom Out": view3D.updateDistance(10); break; + ControlKey key = keyFactory.getKey(e.getCode().toString()); + if(key != null) { + switch (key.toString()) { + case "Zoom In": + view3D.updateDistance(-10); + break; + case "Zoom Out": + view3D.updateDistance(10); + break; + } } }); }