ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-11-04 11:44:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SDL] Workaround for a Mono crash in SDL.JoystickGetGUID

Browse source 
It appears that Mono 3.4.0 fails to marshal SDL_JoystickGUID
correctly when used as a return value. Changing the fixed buffer
to a couple of long fields allows the struct to be marshalled
correctly.
This commit is contained in:
thefiddler 2014-08-09 21:17:49 +02:00
parent 645baeaff3
commit 5444c0c8b8
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Source/OpenTK/Platform/SDL2/Sdl2.cs
View file

@ -1527,21 +1527,22 @@ namespace OpenTK.Platform.SDL2
struct JoystickGuid struct JoystickGuid
{ {
unsafe fixed byte data[16]; long data0;
long data1;
public Guid ToGuid() public Guid ToGuid()
{ {
byte[] bytes = new byte[16]; byte[] data = new byte[16];
unsafe unsafe
{ {
fixed (byte* pdata = data) fixed (JoystickGuid* pdata = &this)
{ {
Marshal.Copy(new IntPtr(pdata), bytes, 0, bytes.Length); Marshal.Copy(new IntPtr(pdata), data, 0, data.Length);
} }
} }
return new Guid(bytes); return new Guid(data);
} }
} }