2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00

Merge pull request #1923 from ogniK5377/nfp-device-list

Device handle should not be a random id, instead it's the current npad id
This commit is contained in:
bunnei 2018-12-19 13:14:43 -05:00 committed by GitHub
commit 4923df10cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -317,8 +317,8 @@ private:
} }
bool has_attached_handle{}; bool has_attached_handle{};
const u64 device_handle{Common::MakeMagic('Y', 'U', 'Z', 'U')}; const u64 device_handle{0}; // Npad device 1
const u32 npad_id{0}; // Player 1 controller const u32 npad_id{0}; // Player 1 controller
State state{State::NonInitialized}; State state{State::NonInitialized};
DeviceState device_state{DeviceState::Initialized}; DeviceState device_state{DeviceState::Initialized};
Kernel::EventPair deactivate_event; Kernel::EventPair deactivate_event;