diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/dix/dixutils.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/dix/dixutils.c')
| -rw-r--r-- | xorg-server/dix/dixutils.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/dix/dixutils.c b/xorg-server/dix/dixutils.c index aaf510623..340564ecd 100644 --- a/xorg-server/dix/dixutils.c +++ b/xorg-server/dix/dixutils.c @@ -270,14 +270,15 @@ dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask access) *pClient = clients[clientIndex]; return Success; bad: - client->errorValue = rid; + if(client) + client->errorValue = rid; *pClient = NULL; return rc; } int AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode, - Bool toRoot, Bool remap) + Bool toRoot, Bool map) { int numnow; SaveSetElt *pTmp = NULL; @@ -303,7 +304,7 @@ AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode, client->numSaved = numnow; SaveSetAssignWindow(client->saveSet[numnow - 1], pWin); SaveSetAssignToRoot(client->saveSet[numnow - 1], toRoot); - SaveSetAssignRemap(client->saveSet[numnow - 1], remap); + SaveSetAssignMap(client->saveSet[numnow - 1], map); return(Success); } else if ((mode == SetModeDelete) && (j < numnow)) |