From 4295f2f008d0d84bbf7d8de48a5f176d48540fce Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 16 Dec 2010 18:39:57 +0000 Subject: [PATCH] Fix an omission from the last commit. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6594 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/MainBase.cpp | 4 ++++ Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index f21f3d431c..b57d59c80d 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -164,6 +164,10 @@ u32 Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData) return 0; } +#if defined(HAVE_X11) && HAVE_X11 +static volatile u32 s_doStateRequested = FALSE; +#endif + static volatile struct { unsigned char **ptr; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index 58050d9de1..46331acd74 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -143,7 +143,7 @@ void DestroyXWindow(void) XUnmapWindow(GLWin.dpy, GLWin.win); GLWin.win = 0; if (GLWin.xEventThread) - GLWin.xEventThread->WaitForDeath(); + delete GLWin.xEventThread; GLWin.xEventThread = NULL; XFreeColormap(GLWin.evdpy, GLWin.attr.colormap); }