On Fri, Aug 19, 2011 at 09:07:13PM +0600, Alexandr Shadchin wrote: > Add call xf86CollectInputOptions() before using pInfo->options. > The bug is seeing by ABI < 12. > > Signed-off-by: Alexandr Shadchin <[email protected]>
Reviewed-by: Matthieu Herrb <[email protected]> > --- > > Sorry for the late answer, entirely lost sight of this bug. > > Change: > * move COLLECT_INPUT_OPTIONS() in old PreInit (make sense only for ABI < 12) > * little expanded commit message > > src/mouse.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/src/mouse.c b/src/mouse.c > index d981f6f..6304149 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. */ > -- > 1.7.6 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel -- Matthieu Herrb _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
