Delay joystick initialization until necessary

This commit is contained in:
Stefanos A 2013-12-22 23:13:21 +01:00 committed by thefiddler
parent 3660509dee
commit a72d70c3d0
2 changed files with 3 additions and 2 deletions

View file

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

View file

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