don't try to open a joystick if controller is NULL

Stephen Birarda committed 12 years ago

Commit f9aed391 parent e6bbb531 file · +6 −3Browse files

Showing the changes to interface/src/scripting/JoystickScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

@@ -52,9 +52,12 @@ JoystickScriptingInterface::JoystickScriptingInterface() : · 51 unmodified lines
52	52
53	53	for (int i = 0; i < joystickCount; i++) {
54	54	SDL_GameController* controller = SDL_GameControllerOpen(i);
55		− SDL_JoystickID id = getInstanceId(controller);
56		− Joystick* joystick = new Joystick(id, SDL_GameControllerName(controller), controller);
57		− _openJoysticks[id] = joystick;
	55	+
	56	+ if (controller) {
	57	+ SDL_JoystickID id = getInstanceId(controller);
	58	+ Joystick* joystick = new Joystick(id, SDL_GameControllerName(controller), controller);
	59	+ _openJoysticks[id] = joystick;
	60	+ }
58	61	}
59	62
60	63	_isInitialized = true;