2 files changed, 3 insertions, 1 deletions
diff --git a/source/client/StarClientApplication.cpp b/source/client/StarClientApplication.cpp
index 09ebf0c..40287b6 100644
--- a/source/client/StarClientApplication.cpp
+++ b/source/client/StarClientApplication.cpp
@@ -199,6 +199,7 @@ void ClientApplication::applicationInit(ApplicationControllerPtr appController)
   bool fullscreen = configuration->get("fullscreen").toBool();
   bool borderless = configuration->get("borderless").toBool();
   bool maximized = configuration->get("maximized").toBool();
+  m_controllerInput = configuration->get("controllerInput").optBool().value();
 
   float updateRate = 1.0f / GlobalTimestep;
   if (auto jUpdateRate = configuration->get("updateRate")) {
@@ -1040,7 +1041,7 @@ void ClientApplication::updateRunning(float dt) {
       config->set("zoomLevel", newZoom);
     }
 
-    if (m_controllerLeftStick.magnitudeSquared() > 0.01f)
+    if (m_controllerInput && m_controllerLeftStick.magnitudeSquared() > 0.01f)
       m_player->setMoveVector(m_controllerLeftStick);
     else
       m_player->setMoveVector(Vec2F());
diff --git a/source/client/StarClientApplication.hpp b/source/client/StarClientApplication.hpp
index 323f2b7..86b50a3 100644
--- a/source/client/StarClientApplication.hpp
+++ b/source/client/StarClientApplication.hpp
@@ -132,6 +132,7 @@ private:
   int m_maxInterfaceScale = 3;
   Vec2F m_crossoverRes;
 
+  bool m_controllerInput;
   Vec2F m_controllerLeftStick;
   Vec2F m_controllerRightStick;
   List<KeyDownEvent> m_heldKeyEvents;