ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-24 17:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delay joystick initialization until necessary

Browse source
This commit is contained in:
Stefanos A. 2013-12-22 23:13:21 +01:00
parent 6d0427b928
commit 5958db383d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/OpenTK/Configuration.cs
View file

@ -206,8 +206,8 @@ namespace OpenTK
{ {
if (!OpenTK.Platform.SDL2.SDL.WasInit(0)) if (!OpenTK.Platform.SDL2.SDL.WasInit(0))
{ {
var flags = OpenTK.Platform.SDL2.SystemFlags.EVERYTHING; var flags =
flags &= ~OpenTK.Platform.SDL2.SystemFlags.AUDIO; OpenTK.Platform.SDL2.SystemFlags.VIDEO | Platform.SDL2.SystemFlags.TIMER;
if (OpenTK.Platform.SDL2.SDL.Init(flags) == 0) if (OpenTK.Platform.SDL2.SDL.Init(flags) == 0)
{ {
supported = true; supported = true;

1
Source/OpenTK/Platform/SDL2/Sdl2InputDriver.cs
View file

@ -59,6 +59,7 @@ namespace OpenTK.Platform.SDL2
driver_handle = new IntPtr(count++); driver_handle = new IntPtr(count++);
DriverHandles.Add(driver_handle, this); DriverHandles.Add(driver_handle, this);
SDL.AddEventWatch(EventFilterDelegate, driver_handle); SDL.AddEventWatch(EventFilterDelegate, driver_handle);
SDL.InitSubSystem(SystemFlags.JOYSTICK | SystemFlags.GAMECONTROLLER);
} }
} }