diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-06-26 16:54:48 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-06-26 16:54:48 -0400 |
| commit | 03fdebac09f76decaa0a51f3491fa606f45df3cb (patch) | |
| tree | 90290958c1318a335e18359d46fec6335e2e9290 /Source/Core | |
| parent | 9edfb5c710b0711bcd24c3cc1d7d136f74112d77 (diff) | |
ExpressionParser: Don't crash when we can't find a device
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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 |