From c745604461541c7b21779c60c9bd09ff1a390df2 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 11 Apr 2012 10:15:07 +1000 Subject: [PATCH] tools: skip non-existing properties If a property doesn't exist on a device, skip it. Signed-off-by: Peter Hutterer Reviewed-by: Chase Douglas --- tools/synclient.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/synclient.c b/tools/synclient.c index 942312a..aef719f 100644 --- a/tools/synclient.c +++ b/tools/synclient.c @@ -446,6 +446,13 @@ dp_set_variables(Display *dpy, XDevice* dev, int argc, char *argv[], int first_c XGetDeviceProperty(dpy, dev, prop, 0, 1000, False, AnyPropertyType, &type, &format, &nitems, &bytes_after, &data); + if (type == None) + { + fprintf(stderr, "Property for '%s' not available. Skipping.\n", + par->name); + continue; + } + switch(par->prop_format) { case 8: @@ -517,6 +524,8 @@ dp_show_settings(Display *dpy, XDevice *dev) XGetDeviceProperty(dpy, dev, a, 0, len, False, AnyPropertyType, &type, &format, &nitems, &bytes_after, &data); + if (type == None) + continue; switch(par->prop_format) { case 8: