]> diplodocus.org Git - xorg-xinput/commitdiff
Error out when selecting a device by name but more than one instance of the name...
authorBenjamin Close <Benjamin.Close@clearchain.com>
Thu, 19 Feb 2009 04:09:29 +0000 (14:39 +1030)
committerBenjamin Close <Benjamin.Close@clearchain.com>
Thu, 2 Apr 2009 02:32:32 +0000 (13:02 +1030)
Previously the check was in place for the duplicate name, however the first
device with the requested name  was still selected regardless.
Correct this by exiting out forcing the user to select by id instead

Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
src/xinput.c

index 466a814d891041b23673247ff39a75c368421efb..b319326095d6c3b941acfc44a32e58581b75e844 100644 (file)
@@ -191,6 +191,7 @@ find_device_info(Display    *display,
                        "Warning: There are multiple devices named \"%s\".\n"
                        "To ensure the correct one is selected, please use "
                        "the device ID instead.\n\n", name);
                        "Warning: There are multiple devices named \"%s\".\n"
                        "To ensure the correct one is selected, please use "
                        "the device ID instead.\n\n", name);
+               return NULL;
            } else {
                found = &devices[loop];
            }
            } else {
                found = &devices[loop];
            }