diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-19 20:18:13 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-19 20:18:13 +0000 |
| commit | f490d83dad064de52a65a1c5a7e374a1a176f05a (patch) | |
| tree | 35d69842a56af15a5ec82dd875dfd5a2f987ad9c /xorg-server/miext/rootless/rootlessScreen.c | |
| parent | b567a3027bceabc0f1f42dd162268f06f15e8149 (diff) | |
| download | vcxsrv-f490d83dad064de52a65a1c5a7e374a1a176f05a.tar.gz vcxsrv-f490d83dad064de52a65a1c5a7e374a1a176f05a.tar.bz2 vcxsrv-f490d83dad064de52a65a1c5a7e374a1a176f05a.zip | |
Updated to xorg-server-1.7.0.902
Diffstat (limited to 'xorg-server/miext/rootless/rootlessScreen.c')
| -rw-r--r-- | xorg-server/miext/rootless/rootlessScreen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/miext/rootless/rootlessScreen.c b/xorg-server/miext/rootless/rootlessScreen.c index b10ca70eb..c73d5170b 100644 --- a/xorg-server/miext/rootless/rootlessScreen.c +++ b/xorg-server/miext/rootless/rootlessScreen.c @@ -257,7 +257,7 @@ RootlessComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, maskWin = (pMask->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pMask->pDrawable : NULL; } - srcWin = (pSrc->pDrawable->type == DRAWABLE_WINDOW) ? + srcWin = (pSrc->pDrawable && pSrc->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pSrc->pDrawable : NULL; dstWin = (pDst->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pDst->pDrawable : NULL; @@ -297,7 +297,7 @@ RootlessGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, GlyphPtr glyph; WindowPtr srcWin, dstWin; - srcWin = (pSrc->pDrawable->type == DRAWABLE_WINDOW) ? + srcWin = (pSrc->pDrawable && pSrc->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pSrc->pDrawable : NULL; dstWin = (pDst->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pDst->pDrawable : NULL; |