diff options
| author | bunnei <bunneidev@gmail.com> | 2018-12-19 13:14:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-19 13:14:43 -0500 |
| commit | 2a2d761bdb0bdbe79abebade9dc3a0af9645b94d (patch) | |
| tree | 083b245915635f24a49e29f72b2ad114323910c0 /src | |
| parent | 0339f523f02246bcc629b1638f2ee77fa8416f4f (diff) | |
| parent | 5bd0ff8f77207ea3d3f4d658b37549ffa861d803 (diff) | |
Merge pull request #1923 from ogniK5377/nfp-device-list
Device handle should not be a random id, instead it's the current npad id
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/nfp/nfp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index d5df112a06..a7bed00400 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -317,8 +317,8 @@ private: } bool has_attached_handle{}; - const u64 device_handle{Common::MakeMagic('Y', 'U', 'Z', 'U')}; - const u32 npad_id{0}; // Player 1 controller + const u64 device_handle{0}; // Npad device 1 + const u32 npad_id{0}; // Player 1 controller State state{State::NonInitialized}; DeviceState device_state{DeviceState::Initialized}; Kernel::EventPair deactivate_event; |
