summaryrefslogtreecommitdiff
path: root/src/core/memory
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-03-01 10:38:20 -0500
committerGitHub <noreply@github.com>2023-03-01 10:38:20 -0500
commit97f7a560f3905a1dd6a4e5a0a308ea752004bf08 (patch)
treee60a69f96d16d051220b66e90906a7abeacf1064 /src/core/memory
parentda11c40849eb338bb77567eba2447398c4bab474 (diff)
parent72e5552409305fe57781b83c3145fb2b66552be2 (diff)
Merge pull request #9832 from liamwhite/hle-mp
service: HLE multiprocess
Diffstat (limited to 'src/core/memory')
-rw-r--r--src/core/memory/cheat_engine.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp
index 44ee39648..c2d96bbec 100644
--- a/src/core/memory/cheat_engine.cpp
+++ b/src/core/memory/cheat_engine.cpp
@@ -47,8 +47,13 @@ void StandardVmCallbacks::MemoryWrite(VAddr address, const void* data, u64 size)
}
u64 StandardVmCallbacks::HidKeysDown() {
- const auto applet_resource =
- system.ServiceManager().GetService<Service::HID::Hid>("hid")->GetAppletResource();
+ const auto hid = system.ServiceManager().GetService<Service::HID::Hid>("hid");
+ if (hid == nullptr) {
+ LOG_WARNING(CheatEngine, "Attempted to read input state, but hid is not initialized!");
+ return 0;
+ }
+
+ const auto applet_resource = hid->GetAppletResource();
if (applet_resource == nullptr) {
LOG_WARNING(CheatEngine,
"Attempted to read input state, but applet resource is not initialized!");