From aaa9cb9cdb93913f97b3f09eaa4a78a48de732b8 Mon Sep 17 00:00:00 2001
From: kalaposfos13 <153381648+kalaposfos13@users.noreply.github.com>
Date: Fri, 9 Jan 2026 10:25:58 +0100
Subject: [PATCH] Add back config check for enabling motion controls

---
 src/input/controller.cpp | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/input/controller.cpp b/src/input/controller.cpp
index 9ad4f9e13..8eabe5df6 100644
--- a/src/input/controller.cpp
+++ b/src/input/controller.cpp
@@ -273,22 +273,23 @@ void GameControllers::TryOpenSDLControllers(GameControllers& controllers) {
                 slot_taken[i] = true;
                 c->player_index = i;
                 AddUserServiceEvent({OrbisUserServiceEventType::Login, i + 1});
-
-                if (SDL_SetGamepadSensorEnabled(c->m_sdl_gamepad, SDL_SENSOR_GYRO, true)) {
-                    c->gyro_poll_rate =
-                        SDL_GetGamepadSensorDataRate(c->m_sdl_gamepad, SDL_SENSOR_GYRO);
-                    LOG_INFO(Input, "Gyro initialized, poll rate: {}", c->gyro_poll_rate);
-                } else {
-                    LOG_ERROR(Input, "Failed to initialize gyro controls for gamepad {}",
-                              c->user_id);
-                }
-                if (SDL_SetGamepadSensorEnabled(c->m_sdl_gamepad, SDL_SENSOR_ACCEL, true)) {
-                    c->accel_poll_rate =
-                        SDL_GetGamepadSensorDataRate(c->m_sdl_gamepad, SDL_SENSOR_ACCEL);
-                    LOG_INFO(Input, "Accel initialized, poll rate: {}", c->accel_poll_rate);
-                } else {
-                    LOG_ERROR(Input, "Failed to initialize accel controls for gamepad {}",
-                              c->user_id);
+                if (EmulatorSettings::GetInstance()->IsMotionControlsEnabled()) {
+                    if (SDL_SetGamepadSensorEnabled(c->m_sdl_gamepad, SDL_SENSOR_GYRO, true)) {
+                        c->gyro_poll_rate =
+                            SDL_GetGamepadSensorDataRate(c->m_sdl_gamepad, SDL_SENSOR_GYRO);
+                        LOG_INFO(Input, "Gyro initialized, poll rate: {}", c->gyro_poll_rate);
+                    } else {
+                        LOG_ERROR(Input, "Failed to initialize gyro controls for gamepad {}",
+                                  c->user_id);
+                    }
+                    if (SDL_SetGamepadSensorEnabled(c->m_sdl_gamepad, SDL_SENSOR_ACCEL, true)) {
+                        c->accel_poll_rate =
+                            SDL_GetGamepadSensorDataRate(c->m_sdl_gamepad, SDL_SENSOR_ACCEL);
+                        LOG_INFO(Input, "Accel initialized, poll rate: {}", c->accel_poll_rate);
+                    } else {
+                        LOG_ERROR(Input, "Failed to initialize accel controls for gamepad {}",
+                                  c->user_id);
+                    }
                 }
                 break;
             }