[PATCH mouse v2] Fix wrong read Protocol and Device from xorg.conf

Alexandr Shadchin alexandr.shadchin at gmail.com
Tue Jun 14 07:04:45 PDT 2011


Add call xf86CollectInputOptions() before using pInfo->options.

Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
---
 src/mouse.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mouse.c b/src/mouse.c
index c3498ea..e3d3d9f 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -927,6 +927,8 @@ MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
     pMse->PostEvent = MousePostEvent;
     pMse->CommonOptions = MouseCommonOptions;
 
+    COLLECT_INPUT_OPTIONS(pInfo, NULL);
+
     /* Find the protocol type. */
     protocol = xf86SetStrOption(pInfo->options, "Protocol", NULL);
     if (protocol) {
-- 
1.7.5



More information about the xorg-devel mailing list