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

Fix an omission from the last commit. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6594 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-12-16 18:39:57 +00:00
parent 4553699077
commit 4295f2f008
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/Src/MainBase.cpp
View File

@ -164,6 +164,10 @@ u32 Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData)
return 0; return 0;
} }
#if defined(HAVE_X11) && HAVE_X11
static volatile u32 s_doStateRequested = FALSE;
#endif
static volatile struct static volatile struct
{ {
unsigned char **ptr; unsigned char **ptr;

2
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -143,7 +143,7 @@ void DestroyXWindow(void)
XUnmapWindow(GLWin.dpy, GLWin.win); XUnmapWindow(GLWin.dpy, GLWin.win);
GLWin.win = 0; GLWin.win = 0;
if (GLWin.xEventThread) if (GLWin.xEventThread)
GLWin.xEventThread->WaitForDeath(); delete GLWin.xEventThread;
GLWin.xEventThread = NULL; GLWin.xEventThread = NULL;
XFreeColormap(GLWin.evdpy, GLWin.attr.colormap); XFreeColormap(GLWin.evdpy, GLWin.attr.colormap);
} }