diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
| commit | 2c345c9da4dedfafe791557ca3fcf891ce26249d (patch) | |
| tree | 18dc73394bd3921415b57b5847f03a9753374e99 /xorg-server/dix/touch.c | |
| parent | 7c531937cfab42f2fd3233c096c409ebdd5b59af (diff) | |
| parent | 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (diff) | |
| download | vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.gz vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.bz2 vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 5 nov 2012
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/mesa/main/.gitignore
xorg-server/Xi/chgdctl.c
xorg-server/dix/getevents.c
xorg-server/hw/xwin/winprefs.c
xorg-server/os/utils.c
Diffstat (limited to 'xorg-server/dix/touch.c')
| -rw-r--r-- | xorg-server/dix/touch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/dix/touch.c b/xorg-server/dix/touch.c index e64a6262c..5f77be575 100644 --- a/xorg-server/dix/touch.c +++ b/xorg-server/dix/touch.c @@ -572,8 +572,8 @@ TouchBuildSprite(DeviceIntPtr sourcedev, TouchPointInfoPtr ti, return FALSE; /* Mark which grabs/event selections we're delivering to: max one grab per - * window plus the bottom-most event selection. */ - ti->listeners = calloc(sprite->spriteTraceGood + 1, sizeof(*ti->listeners)); + * window plus the bottom-most event selection, plus any active grab. */ + ti->listeners = calloc(sprite->spriteTraceGood + 2, sizeof(*ti->listeners)); if (!ti->listeners) { sprite->spriteTraceGood = 0; return FALSE; |