ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-09-27 13:57:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #571 from UnknownShadow200/develop

Browse source 
Fix X11 drag-n-drop returning wrong filename, and crashing
This commit is contained in:
Jarl Gullberg 2017-07-12 15:28:34 +02:00 committed by GitHub
parent 0c585b685c 65e59d9f42
commit 31faf624da
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/OpenTK/Platform/X11/X11GLNative.cs
View file

@ -344,8 +344,8 @@ namespace OpenTK.Platform.X11
string[] fileNames = new string[splitted.Length]; string[] fileNames = new string[splitted.Length];
for (int i = 0; i < splitted.Length; i++) for (int i = 0; i < splitted.Length; i++)
{ {
// Delete start of name - file:// // Delete starting file://, filename data is URI-encoded
fileNames[i] = splitted[i].Substring(7); fileNames[i] = Uri.UnescapeDataString(splitted[i].Substring(7));
} }
return fileNames; return fileNames;
@ -886,9 +886,9 @@ namespace OpenTK.Platform.X11
else else
{ {
formats = Marshal.AllocHGlobal(3 * IntPtr.Size); formats = Marshal.AllocHGlobal(3 * IntPtr.Size);
Marshal.WriteIntPtr(formats, e.ClientMessageEvent.ptr3); Marshal.WriteIntPtr(formats, IntPtr.Size * 0, e.ClientMessageEvent.ptr3);
Marshal.WriteIntPtr(formats, IntPtr.Size * 2, e.ClientMessageEvent.ptr4); Marshal.WriteIntPtr(formats, IntPtr.Size * 1, e.ClientMessageEvent.ptr4);
Marshal.WriteIntPtr(formats, IntPtr.Size * 3, e.ClientMessageEvent.ptr5); Marshal.WriteIntPtr(formats, IntPtr.Size * 2, e.ClientMessageEvent.ptr5);
formatCount = 3; formatCount = 3;
} }