ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[X11] Fixed BadWindow error on shutdown

Browse source 
This was caused by calling XDestroyWindow inside Dispose(), or
by processing events after calling XDestroyWindow. Pending events
are now discarded when Close() is called and not cancelled, and
XDestroyWindow is only called if the window exists.
This commit is contained in:
thefiddler 2014-05-19 22:02:46 +02:00
parent ade8e61625
commit ec31675fc8
1 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Source/OpenTK/Platform/X11/X11GLNative.cs
View file

@ -831,12 +831,8 @@ namespace OpenTK.Platform.X11
if (!ce.Cancel)
{
isExiting = true;
Debug.WriteLine("Destroying window.");
using (new XLock(window.Display))
{
Functions.XDestroyWindow(window.Display, window.Handle);
}
DestroyWindow();
OnClosed(EventArgs.Empty);
break;
}
}
@ -846,9 +842,6 @@ namespace OpenTK.Platform.X11
case XEventName.DestroyNotify:
Debug.WriteLine("Window destroyed");
exists = false;
OnClosed(EventArgs.Empty);
return;
case XEventName.ConfigureNotify:
@ -1653,7 +1646,9 @@ namespace OpenTK.Platform.X11
Debug.WriteLine("X11GLNative shutdown sequence initiated.");
using (new XLock(window.Display))
{
Functions.XSync(window.Display, true);
Functions.XDestroyWindow(window.Display, window.Handle);
exists = false;
}
}
@ -1711,20 +1706,15 @@ namespace OpenTK.Platform.X11
{
if (window != null && window.Handle != IntPtr.Zero)
{
Functions.XFreeCursor(window.Display, EmptyCursor);
if(cursorHandle != IntPtr.Zero)
{
Functions.XFreeCursor(window.Display, cursorHandle);
}
if (Exists)
{
using (new XLock(window.Display))
{
if(cursorHandle != IntPtr.Zero)
{
Functions.XFreeCursor(window.Display, cursorHandle);
}
Functions.XFreeCursor(window.Display, EmptyCursor);
Functions.XDestroyWindow(window.Display, window.Handle);
}
while (Exists)
ProcessEvents();
DestroyWindow();
}
window.Dispose();