From 00768ad17f202e4c8f9aca7adae5f76cc476b801 Mon Sep 17 00:00:00 2001
From: sorgelig <pour.garbage@gmail.com>
Date: Wed, 25 Dec 2019 05:30:26 +0800
Subject: [PATCH] joymapping: fix the message.

---
 joymapping.cpp | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/joymapping.cpp b/joymapping.cpp
index 65e1ec4..33edecf 100644
--- a/joymapping.cpp
+++ b/joymapping.cpp
@@ -165,7 +165,7 @@ void map_joystick(uint32_t *map, uint32_t *mmap)
 		int idx = i+DPAD_COUNT;
 		char *btn_name = defaults ? joy_pnames[i] : joy_nnames[i];
 
-		strcat(mapinfo, "\n ");
+		int mapped = 1;
 
 		if(!strcasecmp(btn_name, "A")
 		|| !strcasecmp(btn_name, "Jump")
@@ -173,7 +173,7 @@ void map_joystick(uint32_t *map, uint32_t *mmap)
 		|| !strcasecmp(btn_name, "Button I"))
 		{
 			map[idx] = mmap[SYS_BTN_A];
-			strcat(mapinfo, "[A]");
+			strcat(mapinfo, "\n[A]");
 		}
 
 		else if(!strcasecmp(btn_name, "B")
@@ -181,7 +181,7 @@ void map_joystick(uint32_t *map, uint32_t *mmap)
 		|| !strcasecmp(btn_name, "Button II"))
 		{
 			map[idx] = mmap[SYS_BTN_B];
-			strcat(mapinfo, "[B]");
+			strcat(mapinfo, "\n[B]");
 		}
 
 		else if(!strcasecmp(btn_name, "X")
@@ -190,7 +190,7 @@ void map_joystick(uint32_t *map, uint32_t *mmap)
 		|| !strcasecmp(btn_name, "Button III"))
 		{
 			map[idx] = mmap[SYS_BTN_X];
-			strcat(mapinfo, "[X]");
+			strcat(mapinfo, "\n[X]");
 		}
 
 		else if(!strcasecmp(btn_name, "Y")
@@ -199,7 +199,7 @@ void map_joystick(uint32_t *map, uint32_t *mmap)
 		|| !strcasecmp(btn_name, "Button IV"))
 		{
 			map[idx] = mmap[SYS_BTN_Y];
-			strcat(mapinfo, "[Y]");
+			strcat(mapinfo, "\n[Y]");
 		}
 
 		// Genesis C and Z  and TG16 V and VI
@@ -210,7 +210,7 @@ void map_joystick(uint32_t *map, uint32_t *mmap)
 		|| !strcasecmp(btn_name, "Coin"))
 		{
 			map[idx] = mmap[SYS_BTN_R];
-			strcat(mapinfo, "[R]");
+			strcat(mapinfo, "\n[R]");
 		}
 
 		else if(!strcasecmp(btn_name, "L")
@@ -219,7 +219,7 @@ void map_joystick(uint32_t *map, uint32_t *mmap)
 		|| !strcasecmp(btn_name, "Button VI"))
 		{
 			map[idx] = mmap[SYS_BTN_L];
-			strcat(mapinfo, "[L]");
+			strcat(mapinfo, "\n[L]");
 		}
 
 		else if(!strcasecmp(btn_name, "Select")
@@ -228,7 +228,7 @@ void map_joystick(uint32_t *map, uint32_t *mmap)
 		|| !strcasecmp(btn_name, "Start 2P"))
 		{
 			map[idx] = mmap[SYS_BTN_SELECT];
-			strcat(mapinfo, "[\x96]");
+			strcat(mapinfo, "\n[\x96]");
 		}
 
 		else if(!strcasecmp(btn_name, "Start")
@@ -237,10 +237,12 @@ void map_joystick(uint32_t *map, uint32_t *mmap)
 		|| !strcasecmp(btn_name, "Start 1P"))
 		{
 			map[idx] = mmap[SYS_BTN_START];
-			strcat(mapinfo, "[\x16]");
+			strcat(mapinfo, "\n[\x16]");
 		}
 
-		if (map[idx])
+		else mapped = 0;
+
+		if (map[idx] && mapped)
 		{
 			strcat(mapinfo, ": ");
 			strcat(mapinfo, joy_bnames[i]);