summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2020-09-05 15:42:01 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2020-09-05 15:46:34 +0200
commit5b6268d26a178f8104c7075daf24df37147a202b (patch)
treea869445ef861705679cfba39fdfabf418e2ccf80 /src/core
parentMinor cleanup (diff)
downloadyuzu-5b6268d26a178f8104c7075daf24df37147a202b.tar
yuzu-5b6268d26a178f8104c7075daf24df37147a202b.tar.gz
yuzu-5b6268d26a178f8104c7075daf24df37147a202b.tar.bz2
yuzu-5b6268d26a178f8104c7075daf24df37147a202b.tar.lz
yuzu-5b6268d26a178f8104c7075daf24df37147a202b.tar.xz
yuzu-5b6268d26a178f8104c7075daf24df37147a202b.tar.zst
yuzu-5b6268d26a178f8104c7075daf24df37147a202b.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp2
-rw-r--r--src/core/settings.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index 510fa3071..b3b1a3a8a 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -389,7 +389,7 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
// Try to read sixaxis sensor states
std::array<MotionDevice, 2> motion_devices;
- if (sixaxis_sensors_enabled) {
+ if (sixaxis_sensors_enabled && Settings::values.motion_enabled) {
sixaxis_at_rest = true;
for (std::size_t e = 0; e < motion_devices.size(); ++e) {
const auto& device = motions[i][e];
diff --git a/src/core/settings.h b/src/core/settings.h
index 80f0d95a7..9834f44bb 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -152,6 +152,7 @@ struct Values {
bool vibration_enabled;
+ bool motion_enabled;
std::string motion_device;
std::string touch_device;
TouchscreenInput touchscreen;