summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-11-30 00:01:05 +0100
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-11-30 01:21:50 +0100
commitb86fcf7c316d8a024f6ed90e46a20fb977b55f5e (patch)
tree0a6ab4c3a89bfc6ad8821dd0b964d1e19295f313
parentcore: hid: hid_core: Add (Enable/DIsable)AllControllerConfiguration (diff)
downloadyuzu-b86fcf7c316d8a024f6ed90e46a20fb977b55f5e.tar
yuzu-b86fcf7c316d8a024f6ed90e46a20fb977b55f5e.tar.gz
yuzu-b86fcf7c316d8a024f6ed90e46a20fb977b55f5e.tar.bz2
yuzu-b86fcf7c316d8a024f6ed90e46a20fb977b55f5e.tar.lz
yuzu-b86fcf7c316d8a024f6ed90e46a20fb977b55f5e.tar.xz
yuzu-b86fcf7c316d8a024f6ed90e46a20fb977b55f5e.tar.zst
yuzu-b86fcf7c316d8a024f6ed90e46a20fb977b55f5e.zip
-rw-r--r--src/yuzu/applets/qt_controller.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/yuzu/applets/qt_controller.cpp b/src/yuzu/applets/qt_controller.cpp
index 7e80e7836..c5685db2e 100644
--- a/src/yuzu/applets/qt_controller.cpp
+++ b/src/yuzu/applets/qt_controller.cpp
@@ -139,7 +139,6 @@ QtControllerSelectorDialog::QtControllerSelectorDialog(
DisableUnsupportedPlayers();
for (std::size_t player_index = 0; player_index < NUM_PLAYERS; ++player_index) {
- system.HIDCore().GetEmulatedControllerByIndex(player_index)->EnableConfiguration();
SetEmulatedControllers(player_index);
}
@@ -205,9 +204,6 @@ QtControllerSelectorDialog::QtControllerSelectorDialog(
// If all the parameters are met AND only allows a single player,
// stop the constructor here as we do not need to continue.
if (CheckIfParametersMet() && parameters.enable_single_mode) {
- for (std::size_t player_index = 0; player_index < NUM_PLAYERS; ++player_index) {
- system.HIDCore().GetEmulatedControllerByIndex(player_index)->DisableConfiguration();
- }
return;
}
@@ -221,7 +217,9 @@ QtControllerSelectorDialog::QtControllerSelectorDialog(
resize(0, 0);
}
-QtControllerSelectorDialog::~QtControllerSelectorDialog() = default;
+QtControllerSelectorDialog::~QtControllerSelectorDialog() {
+ system.HIDCore().DisableAllControllerConfiguration();
+}
int QtControllerSelectorDialog::exec() {
if (parameters_met && parameters.enable_single_mode) {
@@ -237,12 +235,11 @@ void QtControllerSelectorDialog::ApplyConfiguration() {
Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked());
Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked());
- for (std::size_t player_index = 0; player_index < NUM_PLAYERS; ++player_index) {
- system.HIDCore().GetEmulatedControllerByIndex(player_index)->DisableConfiguration();
- }
}
void QtControllerSelectorDialog::LoadConfiguration() {
+ system.HIDCore().EnableAllControllerConfiguration();
+
const auto* handheld = system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld);
for (std::size_t index = 0; index < NUM_PLAYERS; ++index) {
const auto* controller = system.HIDCore().GetEmulatedControllerByIndex(index);