summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/hid/emulated_controller.cpp3
-rw-r--r--src/core/hid/emulated_controller.h2
-rw-r--r--src/yuzu/configuration/configure_input_player.cpp3
3 files changed, 3 insertions, 5 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp
index 09f870eb0..67969e938 100644
--- a/src/core/hid/emulated_controller.cpp
+++ b/src/core/hid/emulated_controller.cpp
@@ -424,8 +424,7 @@ void EmulatedController::RestoreConfig() {
424 ReloadFromSettings(); 424 ReloadFromSettings();
425} 425}
426 426
427std::vector<Common::ParamPackage> EmulatedController::GetMappedDevices( 427std::vector<Common::ParamPackage> EmulatedController::GetMappedDevices() const {
428 EmulatedDeviceIndex device_index) const {
429 std::vector<Common::ParamPackage> devices; 428 std::vector<Common::ParamPackage> devices;
430 for (const auto& param : button_params) { 429 for (const auto& param : button_params) {
431 if (!param.Has("engine")) { 430 if (!param.Has("engine")) {
diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h
index 3f83108d3..fa7a34278 100644
--- a/src/core/hid/emulated_controller.h
+++ b/src/core/hid/emulated_controller.h
@@ -244,7 +244,7 @@ public:
244 void RestoreConfig(); 244 void RestoreConfig();
245 245
246 /// Returns a vector of mapped devices from the mapped button and stick parameters 246 /// Returns a vector of mapped devices from the mapped button and stick parameters
247 std::vector<Common::ParamPackage> GetMappedDevices(EmulatedDeviceIndex device_index) const; 247 std::vector<Common::ParamPackage> GetMappedDevices() const;
248 248
249 // Returns the current mapped button device 249 // Returns the current mapped button device
250 Common::ParamPackage GetButtonParam(std::size_t index) const; 250 Common::ParamPackage GetButtonParam(std::size_t index) const;
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp
index ed21f4b92..b1575b0d3 100644
--- a/src/yuzu/configuration/configure_input_player.cpp
+++ b/src/yuzu/configuration/configure_input_player.cpp
@@ -855,8 +855,7 @@ void ConfigureInputPlayer::UpdateInputDeviceCombobox() {
855 return; 855 return;
856 } 856 }
857 857
858 const auto devices = 858 const auto devices = emulated_controller->GetMappedDevices();
859 emulated_controller->GetMappedDevices(Core::HID::EmulatedDeviceIndex::AllDevices);
860 UpdateInputDevices(); 859 UpdateInputDevices();
861 860
862 if (devices.empty()) { 861 if (devices.empty()) {