from davidr's tree update some fixes

1 files changed, 13 insertions, 5 deletions

diff --git a/hw/xgl/xglcopy.c b/hw/xgl/xglcopy.c
index b514ba57f..c11bb25c1 100644
--- a/hw/xgl/xglcopy.c
+++ b/hw/xgl/xglcopy.c
@@ -41,11 +41,19 @@ xglCopy (DrawablePtr pSrc,
     if (!nBox)
 	return TRUE;
 
-    if (!xglPrepareTarget (pDst))
-	return FALSE;
-
-    if (!xglSyncSurface (pSrc))
-	return FALSE;
+    if (xglPrepareTarget (pDst))
+    {
+	if (!xglSyncSurface (pSrc))
+	    return FALSE;
+    }
+    else
+    {
+	if (!xglPrepareTarget (pSrc))
+	    return FALSE;
+	
+	if (!xglSyncSurface (pDst))
+	    return FALSE;
+    }
     
     XGL_GET_DRAWABLE (pSrc, src, srcXoff, srcYoff);
     XGL_GET_DRAWABLE (pDst, dst, dstXoff, dstYoff);