mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-05 07:39:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3343 from JosJuice/getstringt-encoding

Browse source 
Fix encoding for savestate slots
This commit is contained in:
skidau 2015-12-29 10:54:54 +11:00
commit 08bf808d49
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/DolphinWX/FrameTools.cpp
View file

@ -465,7 +465,8 @@ wxString CFrame::GetMenuLabel(int Id)
case HK_LOAD_STATE_SLOT_9: case HK_LOAD_STATE_SLOT_9:
case HK_LOAD_STATE_SLOT_10: case HK_LOAD_STATE_SLOT_10:
Label = wxString::Format(_("Slot %i - %s"), 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; break;
case HK_SAVE_STATE_SLOT_1: 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_9:
case HK_SAVE_STATE_SLOT_10: case HK_SAVE_STATE_SLOT_10:
Label = wxString::Format(_("Slot %i - %s"), 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; break;
case HK_SAVE_STATE_FILE: case HK_SAVE_STATE_FILE:
Label = _("Save State..."); Label = _("Save State...");
@ -525,7 +527,8 @@ wxString CFrame::GetMenuLabel(int Id)
case HK_SELECT_STATE_SLOT_9: case HK_SELECT_STATE_SLOT_9:
case HK_SELECT_STATE_SLOT_10: case HK_SELECT_STATE_SLOT_10:
Label = wxString::Format(_("Select Slot %i - %s"), 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; break;