diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-12 14:26:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-12 14:26:41 +0100 |
| commit | 2b5652fc7742c5ac57aca701214b046626a729e9 (patch) | |
| tree | a994b9e63a32a7c061bcfb563aa22369c217e49c /xorg-server/xfixes/cursor.c | |
| parent | 2331d6e4ac699e775ccee07a8a461cae0a98033a (diff) | |
| parent | 5efb0a5e19b75137b7294b27f4e7878aeb8f0927 (diff) | |
| download | vcxsrv-2b5652fc7742c5ac57aca701214b046626a729e9.tar.gz vcxsrv-2b5652fc7742c5ac57aca701214b046626a729e9.tar.bz2 vcxsrv-2b5652fc7742c5ac57aca701214b046626a729e9.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/xfixes/cursor.c')
| -rw-r--r-- | xorg-server/xfixes/cursor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xfixes/cursor.c b/xorg-server/xfixes/cursor.c index ed3babcb4..e61135e89 100644 --- a/xorg-server/xfixes/cursor.c +++ b/xorg-server/xfixes/cursor.c @@ -181,9 +181,9 @@ CursorDisplayCursor (DeviceIntPtr pDev, ev.type = XFixesEventBase + XFixesCursorNotify; ev.subtype = XFixesDisplayCursorNotify; ev.window = e->pWindow->drawable.id; - ev.cursorSerial = pCursor->serialNumber; + ev.cursorSerial = pCursor ? pCursor->serialNumber : 0; ev.timestamp = currentTime.milliseconds; - ev.name = pCursor->name; + ev.name = pCursor ? pCursor->name : None; WriteEventsToClient (e->pClient, 1, (xEvent *) &ev); } } |