From dc53f8b7f360a489bd10355131339809d66378ef Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 11 Apr 2012 03:40:16 +0300 Subject: Add joystick validation before triggering events from it. --- src/inputmanager.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/inputmanager.cpp') diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp index 8a9e89995..e7ac40cf0 100644 --- a/src/inputmanager.cpp +++ b/src/inputmanager.cpp @@ -489,8 +489,11 @@ bool InputManager::handleEvent(const SDL_Event &event) break; case SDL_JOYBUTTONDOWN: - if (triggerAction(joystick->getActionVector(event))) - return true; + if (joystick && joystick->validate()) + { + if (triggerAction(joystick->getActionVector(event))) + return true; + } break; default: break; -- cgit v1.2.3-60-g2f50