diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-28 11:47:02 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-28 11:47:02 +0000 |
| commit | cabec90cc3716d647e7d3c9396fcfa56cafcbfad (patch) | |
| tree | f846844449be9b2a11438cf86ab76977058a50df /xorg-server/mi/misprite.c | |
| parent | e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659 (diff) | |
| download | vcxsrv-cabec90cc3716d647e7d3c9396fcfa56cafcbfad.tar.gz vcxsrv-cabec90cc3716d647e7d3c9396fcfa56cafcbfad.tar.bz2 vcxsrv-cabec90cc3716d647e7d3c9396fcfa56cafcbfad.zip | |
X server is running again (at least via xdmcp)
Diffstat (limited to 'xorg-server/mi/misprite.c')
| -rw-r--r-- | xorg-server/mi/misprite.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/xorg-server/mi/misprite.c b/xorg-server/mi/misprite.c index 0b83abdb4..6c4318f37 100644 --- a/xorg-server/mi/misprite.c +++ b/xorg-server/mi/misprite.c @@ -430,7 +430,7 @@ miSpriteSourceValidate (DrawablePtr pDrawable, int x, int y, int width, if (DevHasCursor(pDev)) { pCursorInfo = MISPRITE(pDev); - if (pDrawable->type == DRAWABLE_WINDOW && pCursorInfo->isUp && + if (pCursorInfo && pDrawable->type == DRAWABLE_WINDOW && pCursorInfo->isUp && pCursorInfo->pScreen == pScreen && ORG_OVERLAP(&pCursorInfo->saved, pDrawable->x, pDrawable->y, x, y, width, height)) @@ -468,7 +468,7 @@ miSpriteCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc) /* * Damage will take care of destination check */ - if (pCursorInfo->isUp && pCursorInfo->pScreen == pScreen && + if (pCursorInfo && pCursorInfo->isUp && pCursorInfo->pScreen == pScreen && RECT_IN_REGION (pScreen, prgnSrc, &pCursorInfo->saved) != rgnOUT) { SPRITE_DEBUG (("CopyWindow remove\n")); @@ -553,9 +553,12 @@ miSpriteInstallColormap (ColormapPtr pMap) if (DevHasCursor(pDev)) { pCursorInfo = MISPRITE(pDev); - pCursorInfo->checkPixels = TRUE; - if (pCursorInfo->isUp && pCursorInfo->pScreen == pScreen) - miSpriteRemoveCursor(pDev, pScreen); + if (pCursorInfo) + { + pCursorInfo->checkPixels = TRUE; + if (pCursorInfo->isUp && pCursorInfo->pScreen == pScreen) + miSpriteRemoveCursor(pDev, pScreen); + } } } |