Mapper: Check against no emulated buttons so that 4-axis joysticks (w…

…ith no buttons) don't trigger a divide by zero when you push a joystick button.
joncampbell123 · Dec 31, 2017 · aaca801 · aaca801
1 parent 9c07bc9
commit aaca801
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp
@@ -847,12 +847,14 @@ class CStickBindGroup : public  CBindGroup {
 				break;
 			case SDL_JOYBUTTONDOWN:
 			case SDL_JOYBUTTONUP:
-				jbutton = &event->jbutton;
-				bool state;
-				state=jbutton->type==SDL_JOYBUTTONDOWN;
-				but = jbutton->button % emulated_buttons;
-				if (jbutton->which == stick) {
-					JOYSTICK_Button(emustick,but,state);
+				if (emulated_buttons != 0) {
+					jbutton = &event->jbutton;
+					bool state;
+					state=jbutton->type==SDL_JOYBUTTONDOWN;
+					but = jbutton->button % emulated_buttons;
+					if (jbutton->which == stick) {
+						JOYSTICK_Button(emustick, but, state);
+					}
 				}
 				break;
 		}