summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2012-06-20 17:32:59 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-06-20 17:32:59 +0100
commitbf732b8843c688dffd5f6db9b9922263bffa7a1b (patch)
treeeadf8e023adaf117019b70c790e79c2fc0f0fb07
parent5dab7be0386b9294d1cd8e65b966a4f2a84e430c (diff)
Fix an error in merging xorg-server-1.12.1 inxserver-cygwin-1.12.2-1
Fix an error in merging xorg-server-1.12.1 in, which prevented AIGLX from working in non-toplevel windows.
-rw-r--r--hw/xwin/glx/winpriv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xwin/glx/winpriv.c b/hw/xwin/glx/winpriv.c
index da91122ed..35cb0c73a 100644
--- a/hw/xwin/glx/winpriv.c
+++ b/hw/xwin/glx/winpriv.c
@@ -84,7 +84,7 @@ winGetWindowInfo(WindowPtr pWin)
if (pWinPriv->hWnd == NULL) {
ErrorF("winGetWindowInfo: forcing window to exist\n");
- winCreateWindowsWindow(pWin);
+ winCreateWindowsWindowHierarchy(pWin);
}
if (pWinPriv->hWnd != NULL) {