diff options
author | marha <marha@users.sourceforge.net> | 2011-11-21 08:08:22 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-11-21 08:08:22 +0100 |
commit | a8a12d4c8be177f63cae7dc96c2b52f09e228a76 (patch) | |
tree | 72ea4c93cc3337810a32ccc0fb34b3bd96d933e9 /xorg-server/miext | |
parent | e3710c8691dceaccf51bb80e5a1f7d1830758f7e (diff) | |
parent | 45710577f374972946a8eb37833a9c94e5a299bf (diff) | |
download | vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.tar.gz vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.tar.bz2 vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/miext')
-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 0801e7206..c8557066e 100644 --- a/xorg-server/miext/rootless/rootlessScreen.c +++ b/xorg-server/miext/rootless/rootlessScreen.c @@ -247,8 +247,8 @@ RootlessComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, WindowPtr srcWin, dstWin, maskWin = NULL; if (pMask) { // pMask can be NULL - maskWin = (pMask->pDrawable->type == DRAWABLE_WINDOW) ? - (WindowPtr)pMask->pDrawable : NULL; + maskWin = (pMask->pDrawable && pMask->pDrawable->type == DRAWABLE_WINDOW) ? + (WindowPtr)pMask->pDrawable : NULL; } srcWin = (pSrc->pDrawable && pSrc->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pSrc->pDrawable : NULL; |