Skip to content

Commit 9e7898d

Browse files
committed
fix SDL_OpenHaptic and SDL_OpenHapticFromJoystick's SDL_SetObjectValid, SDL_SetHapticGain and SDL_SetHapticAutocenter sequence
1 parent d7193a1 commit 9e7898d

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

src/haptic/SDL_haptic.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ SDL_Haptic *SDL_OpenHaptic(SDL_HapticID instance_id)
160160
haptic->next = SDL_haptics;
161161
SDL_haptics = haptic;
162162

163+
SDL_SetObjectValid(haptic, SDL_OBJECT_TYPE_HAPTIC, true);
164+
163165
// Disable autocenter and set gain to max.
164166
if (haptic->supported & SDL_HAPTIC_GAIN) {
165167
SDL_SetHapticGain(haptic, 100);
@@ -168,7 +170,6 @@ SDL_Haptic *SDL_OpenHaptic(SDL_HapticID instance_id)
168170
SDL_SetHapticAutocenter(haptic, 0);
169171
}
170172

171-
SDL_SetObjectValid(haptic, SDL_OBJECT_TYPE_HAPTIC, true);
172173
return haptic;
173174
}
174175

@@ -309,6 +310,15 @@ SDL_Haptic *SDL_OpenHapticFromJoystick(SDL_Joystick *joystick)
309310
SDL_haptics = haptic;
310311

311312
SDL_SetObjectValid(haptic, SDL_OBJECT_TYPE_HAPTIC, true);
313+
314+
// Disable autocenter and set gain to max.
315+
if (haptic->supported & SDL_HAPTIC_GAIN) {
316+
SDL_SetHapticGain(haptic, 100);
317+
}
318+
if (haptic->supported & SDL_HAPTIC_AUTOCENTER) {
319+
SDL_SetHapticAutocenter(haptic, 0);
320+
}
321+
312322
return haptic;
313323
}
314324

0 commit comments

Comments
 (0)