summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-12-19 19:14:43 +0100
committerGitHub <noreply@github.com>2018-12-19 19:14:43 +0100
commit4923df10ccb2afab3a3ccc136b1422d8657f5e0b (patch)
tree083b245915635f24a49e29f72b2ad114323910c0
parentMerge pull request #1909 from heapo/shadow_sampling_fixes (diff)
parentDevice handle should not be a random id, instead it's the current npad id (diff)
downloadyuzu-4923df10ccb2afab3a3ccc136b1422d8657f5e0b.tar
yuzu-4923df10ccb2afab3a3ccc136b1422d8657f5e0b.tar.gz
yuzu-4923df10ccb2afab3a3ccc136b1422d8657f5e0b.tar.bz2
yuzu-4923df10ccb2afab3a3ccc136b1422d8657f5e0b.tar.lz
yuzu-4923df10ccb2afab3a3ccc136b1422d8657f5e0b.tar.xz
yuzu-4923df10ccb2afab3a3ccc136b1422d8657f5e0b.tar.zst
yuzu-4923df10ccb2afab3a3ccc136b1422d8657f5e0b.zip
-rw-r--r--src/core/hle/service/nfp/nfp.cpp4
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 d5df112a0..a7bed0040 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;