diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-19 20:43:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-19 20:43:37 +0000 |
| commit | 9dbe22229a8031aa2f6d922896e1b6539441b7b5 (patch) | |
| tree | bd567f1d98f9431b4963dc3d0b05aea8ac78a1b6 /xorg-server/miext/rootless/rootlessScreen.c | |
| parent | 07d4e6e86e3167bed18d2af81a56f3d9352d2541 (diff) | |
| parent | 7687adcc34c9fc43d526f30b1cf2039b0af48841 (diff) | |
| download | vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.tar.gz vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.tar.bz2 vcxsrv-9dbe22229a8031aa2f6d922896e1b6539441b7b5.zip | |
svn merge ^/branches/released
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; |