From e6728f5077492ff5bbf48890b263d1cbf972626a Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Tue, 31 Jul 2018 23:19:39 -0700 Subject: Don't redundantly store controller GUID when saving a mapping. Remove illegal chars from controller name --- nuklear_ui/blastem_nuklear.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'nuklear_ui/blastem_nuklear.c') diff --git a/nuklear_ui/blastem_nuklear.c b/nuklear_ui/blastem_nuklear.c index 683c95b..9830257 100644 --- a/nuklear_ui/blastem_nuklear.c +++ b/nuklear_ui/blastem_nuklear.c @@ -839,10 +839,14 @@ static void view_controller_variant(struct nk_context *context) const char *name = SDL_JoystickName(joy); size_t namesz = strlen(name); mapping_string = malloc(512 + namesz); - SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joy), mapping_string, 33); - mapping_string[32] = ','; - memcpy(mapping_string + 33, name, namesz); - mapping_pos = 33+namesz; + for (mapping_pos = 0; mapping_pos < namesz; mapping_pos++) + { + char c = name[mapping_pos]; + if (c == ',' || c == '\n' || c == '\r') { + c = ' '; + } + mapping_string[mapping_pos] = c; + } push_view(view_controller_mappings); } -- cgit v1.2.3