VERY experimental Nintendo Switch 2 emulator
C++
core: Make sure npad is initialized
Narr the Regfd0ac567a50c
diff --git a/src/core/hid/input_interpreter.cpp b/src/core/hid/input_interpreter.cppindex a6bdd28f2a..072f38a68e 100644--- a/src/core/hid/input_interpreter.cpp+++ b/src/core/hid/input_interpreter.cpp@@ -20,6 +20,9 @@ InputInterpreter::InputInterpreter(Core::System& system)InputInterpreter::~InputInterpreter() = default;void InputInterpreter::PollInput() {+ if (npad == nullptr) {+ return;+ }const auto button_state = npad->GetAndResetPressState();previous_index = current_index;diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cppindex db30ba598c..3fc4024dc7 100644--- a/src/core/memory/cheat_engine.cpp+++ b/src/core/memory/cheat_engine.cpp@@ -62,7 +62,7 @@ u64 StandardVmCallbacks::HidKeysDown() {}const auto applet_resource = hid->GetResourceManager();- if (applet_resource == nullptr) {+ if (applet_resource == nullptr || applet_resource->GetNpad() == nullptr) {LOG_WARNING(CheatEngine,"Attempted to read input state, but applet resource is not initialized!");return 0;