From 8e74a512adfc69bfe5e84338a4a94808993e31a0 Mon Sep 17 00:00:00 2001 From: Kyzentun Date: Tue, 8 Jul 2014 17:24:09 -0600 Subject: [PATCH] Changed InputFilter to not assert on unrecognized input devices or buttons. --- src/InputFilter.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/InputFilter.cpp b/src/InputFilter.cpp index 82bbe14e64..00d8228f9c 100644 --- a/src/InputFilter.cpp +++ b/src/InputFilter.cpp @@ -170,8 +170,17 @@ void InputFilter::ButtonPressed( const DeviceInput &di ) if( di.ts.IsZero() ) LOG->Warn( "InputFilter::ButtonPressed: zero timestamp is invalid" ); - ASSERT_M( di.device < NUM_InputDevice, ssprintf("Invalid device %i", di.device) ); - ASSERT_M( di.button < NUM_DeviceButton, ssprintf("Invalid button %i", di.button) ); + // Filter out input that is beyond the range of the current system. + if(di.device >= NUM_InputDevice) + { + LOG->Trace("InputFilter::ButtonPressed: Invalid device %i", di.device); + return; + } + if(di.button >= NUM_DeviceButton) + { + LOG->Trace("InputFilter::ButtonPressed: Invalid button %i", di.button); + return; + } ButtonState &bs = GetButtonState( di );