ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #890 from degasus/glx 

glx: fix shutdown hang
This commit is contained in:
Ryan Houdek 2014-08-28 09:13:50 -05:00
parent 6955e023a0 8b0ad5daec
commit 8e7d7418af
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/DolphinWX/GLInterface/X11_Util.cpp
View File

@ -46,6 +46,7 @@ Window cX11Window::CreateXWindow(Window parent, XVisualInfo *vi)
void cX11Window::DestroyXWindow(void) void cX11Window::DestroyXWindow(void)
{ {
XUnmapWindow(dpy, win); XUnmapWindow(dpy, win);
win = 0;
if (xEventThread.joinable()) if (xEventThread.joinable())
xEventThread.join(); xEventThread.join();
XFreeColormap(dpy, colormap); XFreeColormap(dpy, colormap);