From 98db6bd93c003bdcdbc74faadd46403873ff8edf Mon Sep 17 00:00:00 2001 From: zilmar Date: Wed, 27 May 2020 10:00:09 +0930 Subject: [PATCH] Fix up unicoding of menu shortcuts --- Source/Project64/UserInterface/MenuShortCuts.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Project64/UserInterface/MenuShortCuts.cpp b/Source/Project64/UserInterface/MenuShortCuts.cpp index ec72fbcce..ce755db7b 100644 --- a/Source/Project64/UserInterface/MenuShortCuts.cpp +++ b/Source/Project64/UserInterface/MenuShortCuts.cpp @@ -185,9 +185,10 @@ CMenuShortCutKey::CMenuShortCutKey(WORD key, bool bCtrl, bool bAlt, bool bShift, break; } } - if (m_bShift) { m_ShortCutName = stdstr_f("Shift+%ls", m_ShortCutName.c_str()).ToUTF16(); } - if (m_bCtrl) { m_ShortCutName = stdstr_f("Ctrl+%ls", m_ShortCutName.c_str()).ToUTF16(); } - if (m_bAlt) { m_ShortCutName = stdstr_f("Alt+%s", m_ShortCutName.c_str()).ToUTF16(); } + std::string ShortCutName = stdstr().FromUTF16(m_ShortCutName.c_str()); + if (m_bShift) { m_ShortCutName = stdstr_f("Shift+%s", ShortCutName.c_str()).ToUTF16(); } + if (m_bCtrl) { m_ShortCutName = stdstr_f("Ctrl+%s", ShortCutName.c_str()).ToUTF16(); } + if (m_bAlt) { m_ShortCutName = stdstr_f("Alt+%s", ShortCutName.c_str()).ToUTF16(); } } VIRTUAL_KEY * CMenuShortCutKey::VirtualKeyList(int &Size)