mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-29 21:56:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DolphinWX: Fix encoding errors in UpdateTitle

Browse source 
An implicit conversion from std::string to wxString
was to blame, as usual. Fixes issue 10341.
This commit is contained in:
JosJuice 2017-06-16 16:44:01 +02:00
commit 4bee7b7605
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/Core/DolphinWX/Frame.h
View file

@ -14,6 +14,7 @@
#include <wx/frame.h>
#include <wx/image.h>
#include <wx/panel.h>
#include <wx/string.h>
#include <wx/timer.h>
#include "Common/CommonTypes.h"
@ -254,7 +255,7 @@ private:
bool TriggerSTMPowerEvent();
void OnStopped();
void OnRenderWindowSizeRequest(int width, int height);
void UpdateTitle(const std::string& str);
void UpdateTitle(const wxString& str);
static void ConnectWiimote(int wm_idx, bool connect);
// Event functions