From 03fdebac09f76decaa0a51f3491fa606f45df3cb Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 26 Jun 2013 16:54:48 -0400 Subject: [PATCH] ExpressionParser: Don't crash when we can't find a device --- .../InputCommon/Src/ControllerInterface/ExpressionParser.cpp | 3 +++ 1 file changed, 3 insertions(+) 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