Browse Source
Merge pull request #561 from DarkLordZach/fix-odyssey-input-crash
Avoid initializing single-joycon layouts with handheld controller
pull/15/merge
bunnei
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
0 deletions
-
src/core/hle/service/hid/hid.cpp
|
|
|
@ -84,6 +84,10 @@ private: |
|
|
|
|
|
|
|
for (size_t controller = 0; controller < mem.controllers.size(); controller++) { |
|
|
|
for (int index = 0; index < HID_NUM_LAYOUTS; index++) { |
|
|
|
// TODO(DarkLordZach): Is this layout/controller config actually invalid?
|
|
|
|
if (controller == Controller_Handheld && index == Layout_Single) |
|
|
|
continue; |
|
|
|
|
|
|
|
ControllerLayout& layout = mem.controllers[controller].layouts[index]; |
|
|
|
layout.header.num_entries = HID_NUM_ENTRIES; |
|
|
|
layout.header.max_entry_index = HID_NUM_ENTRIES - 1; |
|
|
|
|