From 6589f3b55e335eef6c658c8ba1fe15a062f7e31c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 14 May 2013 08:31:19 +1000 Subject: dix: devices must have valuators before touch is initialized Signed-off-by: Peter Hutterer --- dix/devices.c | 1 + 1 file changed, 1 insertion(+) (limited to 'dix') diff --git a/dix/devices.c b/dix/devices.c index 291b76773..527eea028 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1647,6 +1647,7 @@ InitTouchClassDeviceStruct(DeviceIntPtr device, unsigned int max_touches, BUG_RETURN_VAL(device == NULL, FALSE); BUG_RETURN_VAL(device->touch != NULL, FALSE); + BUG_RETURN_VAL(device->valuator == NULL, FALSE); /* Check the mode is valid, and at least X and Y axes. */ BUG_RETURN_VAL(mode != XIDirectTouch && mode != XIDependentTouch, FALSE); -- cgit v1.2.3