diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-21 08:06:12 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-21 08:06:12 +0100 |
| commit | 45710577f374972946a8eb37833a9c94e5a299bf (patch) | |
| tree | 83862aa10e13033fe715c36f673f6e82c5434934 /xorg-server/miext | |
| parent | 1037d56ca89d503cfd62830a90e934a2806ad804 (diff) | |
| download | vcxsrv-45710577f374972946a8eb37833a9c94e5a299bf.tar.gz vcxsrv-45710577f374972946a8eb37833a9c94e5a299bf.tar.bz2 vcxsrv-45710577f374972946a8eb37833a9c94e5a299bf.zip | |
xserver xkeyboard-config mesa git update 21 nov 2011
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; |