summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameTools.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2015-12-17 11:25:14 +0100
committerJosJuice <josjuice@gmail.com>2015-12-17 11:25:14 +0100
commit9a0b70cc51e3496cc34efa2ed48284baf03b00c2 (patch)
tree6419335dae2e74addc4e689f6c432b254f9cff45 /Source/Core/DolphinWX/FrameTools.cpp
parent2ddf180ee8c30cf46a5a6f342adc0d66a65efdaa (diff)
Fix encoding for savestate slots
StrToWxStr is needed, otherwise the string will not be read as UTF-8.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index 341d9fd8f6..cc21038cf2 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -465,7 +465,8 @@ wxString CFrame::GetMenuLabel(int Id)
case HK_LOAD_STATE_SLOT_9:
case HK_LOAD_STATE_SLOT_10:
Label = wxString::Format(_("Slot %i - %s"),
- Id - HK_LOAD_STATE_SLOT_1 + 1, State::GetInfoStringOfSlot(Id - HK_LOAD_STATE_SLOT_1 + 1).c_str());
+ Id - HK_LOAD_STATE_SLOT_1 + 1,
+ StrToWxStr(State::GetInfoStringOfSlot(Id - HK_LOAD_STATE_SLOT_1 + 1)));
break;
case HK_SAVE_STATE_SLOT_1:
@@ -479,7 +480,8 @@ wxString CFrame::GetMenuLabel(int Id)
case HK_SAVE_STATE_SLOT_9:
case HK_SAVE_STATE_SLOT_10:
Label = wxString::Format(_("Slot %i - %s"),
- Id - HK_SAVE_STATE_SLOT_1 + 1, State::GetInfoStringOfSlot(Id - HK_SAVE_STATE_SLOT_1 + 1).c_str());
+ Id - HK_SAVE_STATE_SLOT_1 + 1,
+ StrToWxStr(State::GetInfoStringOfSlot(Id - HK_SAVE_STATE_SLOT_1 + 1)));
break;
case HK_SAVE_STATE_FILE:
Label = _("Save State...");
@@ -525,7 +527,8 @@ wxString CFrame::GetMenuLabel(int Id)
case HK_SELECT_STATE_SLOT_9:
case HK_SELECT_STATE_SLOT_10:
Label = wxString::Format(_("Select Slot %i - %s"),
- Id - HK_SELECT_STATE_SLOT_1 + 1, State::GetInfoStringOfSlot(Id - HK_SELECT_STATE_SLOT_1 + 1).c_str());
+ Id - HK_SELECT_STATE_SLOT_1 + 1,
+ StrToWxStr(State::GetInfoStringOfSlot(Id - HK_SELECT_STATE_SLOT_1 + 1)));
break;