diff --git a/src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs b/src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs index d7f0a4be5b..af0f4fcf5b 100644 --- a/src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs +++ b/src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs @@ -29,7 +29,7 @@ namespace BizHawk.Bizware.Graphics // make sure that Linux uses the x11 video driver // we need this as mono winforms uses x11 // and the user could potentially try to force the wayland video driver via env vars - SDL_SetHint("SDL_VIDEODRIVER", "x11"); + SDL_SetHintWithPriority("SDL_VIDEODRIVER", "x11", SDL_HintPriority.SDL_HINT_OVERRIDE); // try to use EGL if it is available // GLX is the old API, and is the more or less "deprecated" at this point, and potentially more buggy with some drivers // we do need to a bit more work, in case EGL is not actually available or potentially doesn't have desktop GL support @@ -97,10 +97,10 @@ namespace BizHawk.Bizware.Graphics // we will be turning a foreign window into an SDL window // we need this so it knows that it is capable of using OpenGL functions - SDL_SetHint(SDL_HINT_VIDEO_FOREIGN_WINDOW_OPENGL, "1"); + SDL_SetHintWithPriority(SDL_HINT_VIDEO_FOREIGN_WINDOW_OPENGL, "1", SDL_HintPriority.SDL_HINT_OVERRIDE); // don't allow windows events to be pumped // it's not needed and can be dangerous in some rare cases - SDL_SetHint(SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP, "0"); + SDL_SetHintWithPriority(SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP, "0", SDL_HintPriority.SDL_HINT_OVERRIDE); } #if DEBUG_OPENGL diff --git a/src/BizHawk.Bizware.Input/SDL2/SDL2InputAdapter.cs b/src/BizHawk.Bizware.Input/SDL2/SDL2InputAdapter.cs index 2cdc2c5242..5697a234d5 100644 --- a/src/BizHawk.Bizware.Input/SDL2/SDL2InputAdapter.cs +++ b/src/BizHawk.Bizware.Input/SDL2/SDL2InputAdapter.cs @@ -37,7 +37,7 @@ namespace BizHawk.Bizware.Input { SDL_SetEventFilter(_sdlEventFilter, IntPtr.Zero); // this is required as we create hidden (unfocused!) SDL windows in IGL backends - SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1"); + SDL_SetHintWithPriority(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1", SDL_HintPriority.SDL_HINT_OVERRIDE); } private static void DoSDLEventLoop() diff --git a/src/BizHawk.Client.EmuHawk/Program.cs b/src/BizHawk.Client.EmuHawk/Program.cs index 3a61f32e6e..c3bddabe0a 100644 --- a/src/BizHawk.Client.EmuHawk/Program.cs +++ b/src/BizHawk.Client.EmuHawk/Program.cs @@ -191,7 +191,7 @@ namespace BizHawk.Client.EmuHawk // if this isn't done, SIGINT/SIGTERM get swallowed by SDL if (OSTailoredCode.IsUnixHost) { - SDL2.SDL.SDL_SetHint(SDL2.SDL.SDL_HINT_NO_SIGNAL_HANDLERS, "1"); + SDL2.SDL.SDL_SetHintWithPriority(SDL2.SDL.SDL_HINT_NO_SIGNAL_HANDLERS, "1", SDL2.SDL.SDL_HintPriority.SDL_HINT_OVERRIDE); } var glInitCount = 0;