Commit 01aac1f5 authored by Jeremy Huddleston Sequoia's avatar Jeremy Huddleston Sequoia
Browse files

XQuartz: Avoid a possible deadlock with DRI on OS X 10.7.5 and OS X 10.8.2

<rdar://problem/12338921>
http://bugs.winehq.org/show_bug.cgi?id=31751



Signed-off-by: Jeremy Huddleston Sequoia's avatarJeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 25d26875)
parent 9422321b
......@@ -68,6 +68,7 @@
#include "mi.h"
#include "mipointer.h"
#include "rootless.h"
#include "rootlessCommon.h"
#include "x-hash.h"
#include "x-hook.h"
#include "driWrap.h"
......@@ -384,6 +385,11 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
DRIDrawablePrivPtr pDRIDrawablePriv;
if (pDrawable->type == DRAWABLE_WINDOW) {
/* <rdar://problem/12338921>
* http://bugs.winehq.org/show_bug.cgi?id=31751
*/
RootlessStopDrawing((WindowPtr)pDrawable, FALSE);
pDRIDrawablePriv = CreateSurfaceForWindow(pScreen,
(WindowPtr)pDrawable, &wid);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment