Browse Source

core: Make sure npad is initialized

nce_cpp
Narr the Reg 2 years ago
parent
commit
fd0ac567a5
  1. 3
      src/core/hid/input_interpreter.cpp
  2. 2
      src/core/memory/cheat_engine.cpp

3
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;

2
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;

Loading…
Cancel
Save