N-archive/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

core: Make sure npad is initialized

Browse source
This commit is contained in:
Narr the Reg 2023-12-14 20:04:38 -06:00
parent d10464de30
commit e8ad603cd9
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/hid/input_interpreter.cpp
View file

@ -20,6 +20,9 @@ InputInterpreter::InputInterpreter(Core::System& system)
InputInterpreter::~InputInterpreter() = default; InputInterpreter::~InputInterpreter() = default;
void InputInterpreter::PollInput() { void InputInterpreter::PollInput() {
if (npad == nullptr) {
return;
}
const auto button_state = npad->GetAndResetPressState(); const auto button_state = npad->GetAndResetPressState();
previous_index = current_index; previous_index = current_index;

2
src/core/memory/cheat_engine.cpp
View file

@ -62,7 +62,7 @@ u64 StandardVmCallbacks::HidKeysDown() {
} }
const auto applet_resource = hid->GetResourceManager(); const auto applet_resource = hid->GetResourceManager();
if (applet_resource == nullptr) { if (applet_resource == nullptr || applet_resource->GetNpad() == nullptr) {
LOG_WARNING(CheatEngine, LOG_WARNING(CheatEngine,
"Attempted to read input state, but applet resource is not initialized!"); "Attempted to read input state, but applet resource is not initialized!");
return 0; return 0;