From 1f876cde3903dbd131d8694374f2641651bdb62f Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Fri, 23 Sep 2022 16:40:18 +0200 Subject: [PATCH] lr: use default button name if naomi inputs name is empty --- shell/libretro/libretro.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/shell/libretro/libretro.cpp b/shell/libretro/libretro.cpp index 8e2932301..cbf9ce9d7 100644 --- a/shell/libretro/libretro.cpp +++ b/shell/libretro/libretro.cpp @@ -1369,7 +1369,12 @@ static const char *get_button_name(unsigned device, unsigned id, const char *def return NULL; for (int i = 0; NaomiGameInputs->buttons[i].source != 0; i++) if (NaomiGameInputs->buttons[i].source == mask) - return NaomiGameInputs->buttons[i].name; + { + if (NaomiGameInputs->buttons[i].name[0] != '\0') + return NaomiGameInputs->buttons[i].name; + else + return default_name; + } return NULL; } @@ -1379,7 +1384,13 @@ static const char *get_axis_name(unsigned index, const char *default_name) return default_name; for (int i = 0; NaomiGameInputs->axes[i].name != NULL; i++) if (NaomiGameInputs->axes[i].axis == index) - return NaomiGameInputs->axes[i].name; + { + if (NaomiGameInputs->axes[i].name[0] != '\0') + return NaomiGameInputs->axes[i].name; + else + return default_name; + } + return NULL; }