diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-27 16:19:56 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-05-20 14:28:59 +1000 |
| commit | 8db388967a4756143c9e2d419b8e44ece8792a5f (patch) | |
| tree | 75c6f0b333b09ef490a80b280d3d4179fec782c5 | |
| parent | cbb782d3f5c62b56ebe7cc54914ec597b2ae28bb (diff) | |
| download | xf86-input-wacom-8db388967a4756143c9e2d419b8e44ece8792a5f.tar.gz | |
When updating a button action property, always update all of them.
Otherwise, unsetting a property is impossible.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/wcmXCommand.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c index 2145749..a39f5ce 100644 --- a/src/wcmXCommand.c +++ b/src/wcmXCommand.c @@ -640,18 +640,18 @@ int wcmSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, for (i = 0; i < prop->size; i++) priv->btn_actions[i] = values[i]; - for (i = 0; i < prop->size; i++) + for (i = 0; i < ARRAY_SIZE(priv->keys); i++) { - if (!values[i]) + memset(priv->keys[i], 0, sizeof(priv->keys[i])); + + if (i >= prop->size || !values[i]) continue; XIGetDeviceProperty(local->dev, values[i], &val); - memset(priv->keys[i], 0, sizeof(priv->keys[i])); for (j = 0; j < val->size; j++) priv->keys[i][j] = ((unsigned int*)val->data)[j]; } - } } else { |