diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp index a259f303c8..51f152d434 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp @@ -351,6 +351,9 @@ Device *ControlFinder::FindDevice(ControlQualifier qualifier) Device::Control *ControlFinder::FindControl(ControlQualifier qualifier) { Device *device = FindDevice(qualifier); + if (!device) + return NULL; + if (is_input) return device->FindInput(qualifier.control_name); else