diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-11 09:26:35 +0000 |
| commit | 35b29c19707341bbfa32f7f6136ce09e59cb332c (patch) | |
| tree | a795242657a2b96a463a11774517472fa4c64953 /xorg-server/hw/xfree86/common/xf86DGA.c | |
| parent | ba6498fea6d935aff0856f9851cb47d5657952fa (diff) | |
| parent | e172c89783326e2378e4793ff31a0f44210c5534 (diff) | |
| download | vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.gz vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.tar.bz2 vcxsrv-35b29c19707341bbfa32f7f6136ce09e59cb332c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86DGA.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86DGA.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86DGA.c b/xorg-server/hw/xfree86/common/xf86DGA.c index bc2aa3ba6..1d46a67d3 100644 --- a/xorg-server/hw/xfree86/common/xf86DGA.c +++ b/xorg-server/hw/xfree86/common/xf86DGA.c @@ -1095,7 +1095,7 @@ DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse) ev.header = ET_Internal;
ev.length = sizeof(ev);
ev.type = event->subtype;
- ev.corestate = butc->state;
+ ev.corestate = butc ? butc->state : 0;
if (master && master->key)
ev.corestate |= XkbStateFieldFromRec(&master->key->xkbInfo->state);
|