From ee9b60676a3efe015638763eed69161ee76ed846 Mon Sep 17 00:00:00 2001
From: Joel Teichroeb
Date: Sun, 4 Jan 2015 09:39:55 -0800
Subject: SDL: Warn if the selected joystick does not exist

---
 backends/events/sdl/sdl-events.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'backends')

diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index 2480e7c370..284e0970fd 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -55,16 +55,18 @@ SdlEventSource::SdlEventSource()
 	memset(&_km, 0, sizeof(_km));
 
 	int joystick_num = ConfMan.getInt("joystick_num");
-	if (joystick_num > -1) {
+	if (joystick_num >= 0) {
 		// Initialize SDL joystick subsystem
 		if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1) {
 			error("Could not initialize SDL: %s", SDL_GetError());
 		}
 
 		// Enable joystick
-		if (SDL_NumJoysticks() > 0) {
-			debug("Using joystick: %s", SDL_JoystickName(0));
+		if (SDL_NumJoysticks() > joystick_num) {
+			debug("Using joystick: %s", SDL_JoystickName(joystick_num));
 			_joystick = SDL_JoystickOpen(joystick_num);
+		} else {
+			warning("Invalid joystick: %d", joystick_num);
 		}
 	}
 }
-- 
cgit v1.2.3