Signed-off-by: Peter Hutterer <[email protected]>
---
dix/devices.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/dix/devices.c b/dix/devices.c
index 51a74b6..04008d4 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -365,13 +365,12 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
/* mode doesn't matter */
EnterWindow(dev, screenInfo.screens[0]->root, NotifyAncestor);
}
- else if ((other = NextFreePointerDevice()) == NULL) {
- ErrorF("[dix] cannot find pointer to pair with. "
- "This is a bug.\n");
- return FALSE;
- }
- else
+ else {
+ other = NextFreePointerDevice();
+ BUG_RETURN_VAL_MSG(other == NULL, FALSE,
+ "[dix] cannot find pointer to pair
with.\n");
PairDevices(NULL, other, dev);
+ }
}
else {
if (dev->coreEvents)
--
1.7.10.1
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
