From 5f6243bd7692f6dcc5c8d6daa25063c550db1312 Mon Sep 17 00:00:00 2001 From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com> Date: Thu, 23 Nov 2023 23:08:21 -0800 Subject: [PATCH] Remove SDL_INIT_HAPTIC use We don't actually use the haptic API, which is a separate thing from SDL_GameControllerRumble/SDL_JoystickRumble --- src/BizHawk.Bizware.Input/SDL2/SDL2InputAdapter.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BizHawk.Bizware.Input/SDL2/SDL2InputAdapter.cs b/src/BizHawk.Bizware.Input/SDL2/SDL2InputAdapter.cs index 0aff0630f9..82fe0a6643 100644 --- a/src/BizHawk.Bizware.Input/SDL2/SDL2InputAdapter.cs +++ b/src/BizHawk.Bizware.Input/SDL2/SDL2InputAdapter.cs @@ -84,7 +84,7 @@ namespace BizHawk.Bizware.Input SDL2Gamepad.Deinitialize(); if (_sdlInitCalled) { - SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER); + SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER); _sdlInitCalled = false; } @@ -105,14 +105,14 @@ namespace BizHawk.Bizware.Input // however, let's just test if SDL init works (if it does, 99.9% chance it will on the input thread) try { - if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER) != 0) + if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) != 0) { throw new($"SDL failed to init, SDL error: {SDL_GetError()}"); } } finally { - SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER); + SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER); SDL_FlushEvents(SDL_EventType.SDL_FIRSTEVENT, SDL_EventType.SDL_LASTEVENT); } @@ -137,9 +137,9 @@ namespace BizHawk.Bizware.Input { if (!_sdlInitCalled) { - if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER) != 0) + if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) != 0) { - SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER); + SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER); throw new($"SDL failed to init, SDL error: {SDL_GetError()}"); }