From 745aab78d17872c61a585df31ee53ac459eeba14 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Fri, 24 Apr 2015 00:07:18 -0700
Subject: [PATCH] SDL: Fix boundary conditions for joystick adjustments

---
 CHANGES                       | 1 +
 src/platform/sdl/sdl-events.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 554b0f3db..b5252d806 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,7 @@ Bugfixes:
  - VFS: Fix resource leaks if some allocations fail
  - Debugger: Fix boundary conditions in tab completion
  - Video: Fix an issue with very long filenames
+ - SDL: Fix boundary conditions for joystick adjustments
 Misc:
  - Qt: Show multiplayer numbers in window title
  - Qt: Solar sensor can have shortcuts set
diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c
index 6e9ac8d49..39193d489 100644
--- a/src/platform/sdl/sdl-events.c
+++ b/src/platform/sdl/sdl-events.c
@@ -190,7 +190,7 @@ void GBASDLPlayerLoadConfig(struct GBASDLPlayer* context, const struct Configura
 }
 
 void GBASDLPlayerChangeJoystick(struct GBASDLEvents* events, struct GBASDLPlayer* player, size_t index) {
-	if (player->playerId > MAX_PLAYERS || index >= events->nJoysticks) {
+	if (player->playerId >= MAX_PLAYERS || index >= events->nJoysticks) {
 		return;
 	}
 	events->joysticksClaimed[player->playerId] = index;