From 9db9e964f6ca553dcbd3b7b037745d9581eaa065 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 10 Dec 2010 13:23:13 +1000 Subject: [PATCH] xfree86: swap the order to-be-merged lists in xf86CollectInputOptions. Current order causes the user-configured option list to be overwritten with the default list supplied by the driver. Swap around so we overwrite the driver's default values instead. This only affected options supplied by the driver such as XkbLayout in the case of evdev. Reported-by: Sebastian Glita Reported-by: Simon Thum Signed-off-by: Peter Hutterer Reviewed-by: Simon Thum Reviewed-by: Dan Nicholson Tested-by: Sebastian Glita --- hw/xfree86/common/xf86Option.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index d49aa31..16c27e5 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -130,7 +130,7 @@ xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts) if (defaultOpts) { XF86OptionPtr tmp =xf86optionListCreate(defaultOpts, -1, 0); if (pInfo->options) - pInfo->options = xf86optionListMerge(pInfo->options, tmp); + pInfo->options = xf86optionListMerge(tmp, pInfo->options); else pInfo->options = tmp; } -- 1.7.4