From f28e30694d7e832f6eb72cd70419ac259e4f5919 Mon Sep 17 00:00:00 2001
From: Joel Heaton <joel.j.heaton@gmail.com>
Date: Fri, 30 Oct 2015 17:27:34 +0000
Subject: [PATCH] make controls menu display keybinds correctly

---
 src/guiSettingsMenu.cpp | 4 ++--
 src/keycode.cpp         | 4 ++--
 src/keycode.h           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/guiSettingsMenu.cpp b/src/guiSettingsMenu.cpp
index 3bab5b9..04a83c6 100644
--- a/src/guiSettingsMenu.cpp
+++ b/src/guiSettingsMenu.cpp
@@ -327,7 +327,7 @@ void GUISettingsMenu::regenerateGui(v2u32 screensize)
 			{
 				core::rect < s32 > rect(0, 0, 110, 30);
 				rect += topleft_content + offset + v2s32(155, -5);
-				Environment->addButton(rect, this, GUI_ID_KEYSETTINGS_BASE+i, keys[i].guiName());
+				Environment->addButton(rect, this, GUI_ID_KEYSETTINGS_BASE+i, keys[i].guiName().c_str());
 			}
 			offset += v2s32(0, 33);
 			if (offset.Y > 450) {
@@ -579,7 +579,7 @@ bool GUISettingsMenu::OnEvent(const SEvent& event)
 		gui::IGUIElement *e = getElementFromId(activeKey);
 		if (e != NULL && e->getType() == gui::EGUIET_BUTTON) {
 			e->setEnabled(true);
-			e->setText(kp.guiName());
+			e->setText(kp.guiName().c_str());
 			keys[activeKey-GUI_ID_KEYSETTINGS_BASE] = kp;
 		}
 		activeKey = -1;
diff --git a/src/keycode.cpp b/src/keycode.cpp
index 5208740..23d6d09 100644
--- a/src/keycode.cpp
+++ b/src/keycode.cpp
@@ -339,10 +339,10 @@ const char *KeyPress::name() const
 	}
 }
 
-const wchar_t *KeyPress::guiName() const
+const std::wstring KeyPress::guiName() const
 {
 	const char* n = name();
-	return narrow_to_wide(n).c_str();
+	return narrow_to_wide(n);
 }
 
 const KeyPress EscapeKey("KEY_ESCAPE");
diff --git a/src/keycode.h b/src/keycode.h
index 0bf68be..9084970 100644
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -54,7 +54,7 @@ public:
 
 	const char *sym() const;
 	const char *name() const;
-	const wchar_t *guiName() const;
+    const std::wstring guiName() const;
 
 	std::string debug() const;
 protected: