diff options
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)) |