From 410df5446eb23e75582020790bce2e8241da88ff Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Mon, 29 Nov 2021 17:22:59 -0500
Subject: [PATCH] general: Fix handheld typo

---
 src/core/hle/service/hid/controllers/npad.cpp |  2 +-
 .../configuration/configure_input_player.cpp  | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index 04b3a68c3..35dbf12df 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -635,7 +635,7 @@ void Controller_NPad::OnMotionUpdate(const Core::Timing::CoreTiming& core_timing
             // This buffer only is updated on handheld on HW
             npad.sixaxis_handheld_lifo.WriteNextEntry(sixaxis_handheld_state);
         } else {
-            // Hanheld doesn't update this buffer on HW
+            // Handheld doesn't update this buffer on HW
             npad.sixaxis_fullkey_lifo.WriteNextEntry(sixaxis_fullkey_state);
         }
 
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp
index 16284d5a6..34099bc83 100644
--- a/src/yuzu/configuration/configure_input_player.cpp
+++ b/src/yuzu/configuration/configure_input_player.cpp
@@ -246,15 +246,15 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
     if (player_index == 0) {
         auto* emulated_controller_p1 =
             hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
-        auto* emulated_controller_hanheld =
+        auto* emulated_controller_handheld =
             hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
         emulated_controller_p1->SaveCurrentConfig();
         emulated_controller_p1->EnableConfiguration();
-        emulated_controller_hanheld->SaveCurrentConfig();
-        emulated_controller_hanheld->EnableConfiguration();
-        if (emulated_controller_hanheld->IsConnected(true)) {
+        emulated_controller_handheld->SaveCurrentConfig();
+        emulated_controller_handheld->EnableConfiguration();
+        if (emulated_controller_handheld->IsConnected(true)) {
             emulated_controller_p1->Disconnect();
-            emulated_controller = emulated_controller_hanheld;
+            emulated_controller = emulated_controller_handheld;
         } else {
             emulated_controller = emulated_controller_p1;
         }
@@ -590,19 +590,19 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
                 if (player_index == 0) {
                     auto* emulated_controller_p1 =
                         hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
-                    auto* emulated_controller_hanheld =
+                    auto* emulated_controller_handheld =
                         hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
                     bool is_connected = emulated_controller->IsConnected(true);
 
                     emulated_controller_p1->SetNpadStyleIndex(type);
-                    emulated_controller_hanheld->SetNpadStyleIndex(type);
+                    emulated_controller_handheld->SetNpadStyleIndex(type);
                     if (is_connected) {
                         if (type == Core::HID::NpadStyleIndex::Handheld) {
                             emulated_controller_p1->Disconnect();
-                            emulated_controller_hanheld->Connect();
-                            emulated_controller = emulated_controller_hanheld;
+                            emulated_controller_handheld->Connect();
+                            emulated_controller = emulated_controller_handheld;
                         } else {
-                            emulated_controller_hanheld->Disconnect();
+                            emulated_controller_handheld->Disconnect();
                             emulated_controller_p1->Connect();
                             emulated_controller = emulated_controller_p1;
                         }
@@ -650,10 +650,10 @@ ConfigureInputPlayer::~ConfigureInputPlayer() {
     if (player_index == 0) {
         auto* emulated_controller_p1 =
             hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
-        auto* emulated_controller_hanheld =
+        auto* emulated_controller_handheld =
             hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
         emulated_controller_p1->DisableConfiguration();
-        emulated_controller_hanheld->DisableConfiguration();
+        emulated_controller_handheld->DisableConfiguration();
     } else {
         emulated_controller->DisableConfiguration();
     }
@@ -663,14 +663,14 @@ void ConfigureInputPlayer::ApplyConfiguration() {
     if (player_index == 0) {
         auto* emulated_controller_p1 =
             hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
-        auto* emulated_controller_hanheld =
+        auto* emulated_controller_handheld =
             hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
         emulated_controller_p1->DisableConfiguration();
         emulated_controller_p1->SaveCurrentConfig();
         emulated_controller_p1->EnableConfiguration();
-        emulated_controller_hanheld->DisableConfiguration();
-        emulated_controller_hanheld->SaveCurrentConfig();
-        emulated_controller_hanheld->EnableConfiguration();
+        emulated_controller_handheld->DisableConfiguration();
+        emulated_controller_handheld->SaveCurrentConfig();
+        emulated_controller_handheld->EnableConfiguration();
         return;
     }
     emulated_controller->DisableConfiguration();