summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lioncash2018-10-24 00:37:36 -0400
committerGravatar Lioncash2018-10-24 00:38:03 -0400
commit93596d03ec56921b19a04ae7ac4fde6a178cab04 (patch)
treede3f126ff9132ba4c337bc1f710e6577163c85a8
parentMerge pull request #1551 from ogniK5377/improved-svcbreak (diff)
downloadyuzu-93596d03ec56921b19a04ae7ac4fde6a178cab04.tar.gz
yuzu-93596d03ec56921b19a04ae7ac4fde6a178cab04.tar.xz
yuzu-93596d03ec56921b19a04ae7ac4fde6a178cab04.zip
npad: Remove unused controller variable from OnInit()
This also gets rid of variable shadowing related to the lambda parameter a little bit below this code as well.
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index b06e65a77..4b4d1324f 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -108,9 +108,10 @@ void Controller_NPad::OnInit() {
108 styleset_changed_event = 108 styleset_changed_event =
109 Kernel::Event::Create(kernel, Kernel::ResetType::OneShot, "npad:NpadStyleSetChanged"); 109 Kernel::Event::Create(kernel, Kernel::ResetType::OneShot, "npad:NpadStyleSetChanged");
110 110
111 if (!IsControllerActivated()) 111 if (!IsControllerActivated()) {
112 return; 112 return;
113 std::size_t controller{}; 113 }
114
114 if (style.raw == 0) { 115 if (style.raw == 0) {
115 // We want to support all controllers 116 // We want to support all controllers
116 style.handheld.Assign(1); 117 style.handheld.Assign(1);