Allow to match by uniq without name

This allows for DeviceMatch=usb:1234:5678||someuniq
linuxwacom · May 7, 2024 · 8211817 · 8211817
1 parent 31f5b7b
commit 8211817
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
@@ -158,7 +158,7 @@ make_match_string (const char *name, const char *uniq, WacomBusType bus, int ven
 	return g_strdup_printf("%s|%04x|%04x%s%s%s%s",
 				bus_to_str (bus),
 				vendor_id, product_id,
-				name ? "|" : "",
+				(name || uniq) ? "|" : "",
 				name ? name : "",
 			        uniq ? "|" : "",
 			        uniq ? uniq : "");

diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
@@ -752,6 +752,10 @@ libwacom_new_from_builder(const WacomDeviceDatabase *db, const WacomBuilder *bui
 				if (device == NULL) {
 					match_name = NULL;
 					device = libwacom_new (db, match_name, match_uniq, vendor_id, product_id, *bus, error);
+					if (device == NULL) {
+						match_uniq = uniq;
+						device = libwacom_new (db, match_name, match_uniq, vendor_id, product_id, *bus, error);
+					}
 				}
 			}
 			if (device)