summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandr Shadchin <alexandr.shadchin@gmail.com>2011-08-19 21:07:13 +0600
committerPeter Hutterer <peter.hutterer@who-t.net>2011-08-22 08:14:03 +1000
commitb65651974ee5620086b484086ea12d78c92fa369 (patch)
treeab106178b3325a09f3215a1be5393310f11a4da7
parent7bb5cbecbcc24f20467546f957fb95c9190514c0 (diff)
Fix wrong read Protocol and Device from xorg.conf
Add call xf86CollectInputOptions() before using pInfo->options. The bug is seeing by ABI < 12. Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/mouse.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mouse.c b/src/mouse.c
index d883b82..5160786 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pInfo->private_flags = 0;
pInfo->always_core_feedback = NULL;
+ COLLECT_INPUT_OPTIONS(pInfo, NULL);
+
if (NewMousePreInit(drv, pInfo, flags) == Success)
{
/* Check if SendDragEvents has been disabled. */