ExpressionParser: Don't crash when we can't find a device

2013-06-26 16:54:48 -04:00 · 2013-06-26 16:54:48 -04:00 · 03fdebac09
parent 9edfb5c710
commit 03fdebac09
1 changed files with 3 additions and 0 deletions
--- 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