From 97682e09ab7d4ca10bf9e6a1d1c5f48303ca8e03 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sat, 27 Mar 2021 13:42:32 +1000 Subject: [PATCH] Pad: Don't apply input state when load-from-devices is off --- src/core/pad.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/pad.cpp b/src/core/pad.cpp index a32a3c081..9787c5898 100644 --- a/src/core/pad.cpp +++ b/src/core/pad.cpp @@ -119,9 +119,9 @@ bool Pad::DoStateController(StateWrapper& sw, u32 i) return false; if (auto& controller = m_controllers[i]; controller && controller->GetType() == state_controller_type) - return controller->DoState(sw, true); + return controller->DoState(sw, g_settings.load_devices_from_save_states); else if (auto dummy = Controller::Create(state_controller_type, i); dummy) - return dummy->DoState(sw, true); + return dummy->DoState(sw, g_settings.load_devices_from_save_states); return true; }