mirror of https://github.com/encounter/SDL.git
Fixed crash if SDL API functions are called on a disconnected controller on iOS
This commit is contained in:
parent
a43d3f6931
commit
f3fd1ffb99
|
@ -1268,6 +1268,10 @@ IOS_JoystickRumble(SDL_Joystick *joystick, Uint16 low_frequency_rumble, Uint16 h
|
||||||
#ifdef ENABLE_MFI_RUMBLE
|
#ifdef ENABLE_MFI_RUMBLE
|
||||||
SDL_JoystickDeviceItem *device = joystick->hwdata;
|
SDL_JoystickDeviceItem *device = joystick->hwdata;
|
||||||
|
|
||||||
|
if (device == NULL) {
|
||||||
|
return SDL_SetError("Controller is no longer connected");
|
||||||
|
}
|
||||||
|
|
||||||
if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
|
if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
|
||||||
if (!device->rumble && device->controller && device->controller.haptics) {
|
if (!device->rumble && device->controller && device->controller.haptics) {
|
||||||
SDL_RumbleContext *rumble = IOS_JoystickInitRumble(device->controller);
|
SDL_RumbleContext *rumble = IOS_JoystickInitRumble(device->controller);
|
||||||
|
@ -1294,6 +1298,10 @@ IOS_JoystickRumbleTriggers(SDL_Joystick *joystick, Uint16 left_rumble, Uint16 ri
|
||||||
#ifdef ENABLE_MFI_RUMBLE
|
#ifdef ENABLE_MFI_RUMBLE
|
||||||
SDL_JoystickDeviceItem *device = joystick->hwdata;
|
SDL_JoystickDeviceItem *device = joystick->hwdata;
|
||||||
|
|
||||||
|
if (device == NULL) {
|
||||||
|
return SDL_SetError("Controller is no longer connected");
|
||||||
|
}
|
||||||
|
|
||||||
if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
|
if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
|
||||||
if (!device->rumble && device->controller && device->controller.haptics) {
|
if (!device->rumble && device->controller && device->controller.haptics) {
|
||||||
SDL_RumbleContext *rumble = IOS_JoystickInitRumble(device->controller);
|
SDL_RumbleContext *rumble = IOS_JoystickInitRumble(device->controller);
|
||||||
|
@ -1319,8 +1327,14 @@ IOS_JoystickHasLED(SDL_Joystick *joystick)
|
||||||
{
|
{
|
||||||
#ifdef ENABLE_MFI_LIGHT
|
#ifdef ENABLE_MFI_LIGHT
|
||||||
@autoreleasepool {
|
@autoreleasepool {
|
||||||
|
SDL_JoystickDeviceItem *device = joystick->hwdata;
|
||||||
|
|
||||||
|
if (device == NULL) {
|
||||||
|
return SDL_FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
if (@available(macos 11.0, iOS 14.0, tvOS 14.0, *)) {
|
if (@available(macos 11.0, iOS 14.0, tvOS 14.0, *)) {
|
||||||
GCController *controller = joystick->hwdata->controller;
|
GCController *controller = device->controller;
|
||||||
GCDeviceLight *light = controller.light;
|
GCDeviceLight *light = controller.light;
|
||||||
if (light) {
|
if (light) {
|
||||||
return SDL_TRUE;
|
return SDL_TRUE;
|
||||||
|
@ -1337,8 +1351,14 @@ IOS_JoystickSetLED(SDL_Joystick *joystick, Uint8 red, Uint8 green, Uint8 blue)
|
||||||
{
|
{
|
||||||
#ifdef ENABLE_MFI_LIGHT
|
#ifdef ENABLE_MFI_LIGHT
|
||||||
@autoreleasepool {
|
@autoreleasepool {
|
||||||
|
SDL_JoystickDeviceItem *device = joystick->hwdata;
|
||||||
|
|
||||||
|
if (device == NULL) {
|
||||||
|
return SDL_SetError("Controller is no longer connected");
|
||||||
|
}
|
||||||
|
|
||||||
if (@available(macos 11.0, iOS 14.0, tvOS 14.0, *)) {
|
if (@available(macos 11.0, iOS 14.0, tvOS 14.0, *)) {
|
||||||
GCController *controller = joystick->hwdata->controller;
|
GCController *controller = device->controller;
|
||||||
GCDeviceLight *light = controller.light;
|
GCDeviceLight *light = controller.light;
|
||||||
if (light) {
|
if (light) {
|
||||||
light.color = [[GCColor alloc] initWithRed:(float)red / 255.0f
|
light.color = [[GCColor alloc] initWithRed:(float)red / 255.0f
|
||||||
|
@ -1364,8 +1384,14 @@ IOS_JoystickSetSensorsEnabled(SDL_Joystick *joystick, SDL_bool enabled)
|
||||||
{
|
{
|
||||||
#ifdef ENABLE_MFI_SENSORS
|
#ifdef ENABLE_MFI_SENSORS
|
||||||
@autoreleasepool {
|
@autoreleasepool {
|
||||||
|
SDL_JoystickDeviceItem *device = joystick->hwdata;
|
||||||
|
|
||||||
|
if (device == NULL) {
|
||||||
|
return SDL_SetError("Controller is no longer connected");
|
||||||
|
}
|
||||||
|
|
||||||
if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
|
if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
|
||||||
GCController *controller = joystick->hwdata->controller;
|
GCController *controller = device->controller;
|
||||||
GCMotion *motion = controller.motion;
|
GCMotion *motion = controller.motion;
|
||||||
if (motion) {
|
if (motion) {
|
||||||
motion.sensorsActive = enabled ? YES : NO;
|
motion.sensorsActive = enabled ? YES : NO;
|
||||||
|
|
Loading…
Reference in New Issue