geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include the manufacturer if it's already included in the product string

Sam Lantinga 2019-12-10 10:00:49 -08:00
parent bb37a1ebf5
commit 3469481ef6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/joystick/hidapi/SDL_hidapijoystick.c
View File

@ -806,7 +806,11 @@ HIDAPI_AddDevice(struct hid_device_info *info)
size_t name_size = (SDL_strlen(manufacturer_string) + 1 + SDL_strlen(product_string) + 1); size_t name_size = (SDL_strlen(manufacturer_string) + 1 + SDL_strlen(product_string) + 1);
device->name = (char *)SDL_malloc(name_size); device->name = (char *)SDL_malloc(name_size);
if (device->name) { if (device->name) {
SDL_snprintf(device->name, name_size, "%s %s", manufacturer_string, product_string); if (SDL_strncasecmp(manufacturer_string, product_string, SDL_strlen(manufacturer_string)) == 0) {
SDL_strlcpy(device->name, product_string, name_size);
} else {
SDL_snprintf(device->name, name_size, "%s %s", manufacturer_string, product_string);
}
} }
} }
if (manufacturer_string) { if (manufacturer_string) {