ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #818 from micove/Linux_Segfault 

Linux: Fix segmentation fault with the new libstdc++ ABI.
Closes #780
This commit is contained in:
micove 2015-09-13 00:31:09 -04:00
parent 53680d538d f1cb2cfa35
commit f062b0f671
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/Utilities/pxTranslate.cpp
View File

@ -29,8 +29,7 @@ const wxChar* __fastcall pxExpandMsg( const wxChar* englishContent )
#if _WIN32 || wxMAJOR_VERSION < 3 #if _WIN32 || wxMAJOR_VERSION < 3
return wxGetTranslation(englishContent); return wxGetTranslation(englishContent);
#else #else
wxString translation = wxGetTranslation( englishContent ); return wxGetTranslation(englishContent).wc_str();
return translation.wc_str();
#endif #endif
} }
@ -53,7 +52,6 @@ const wxChar* __fastcall pxGetTranslation( const wxChar* message )
#if _WIN32 || wxMAJOR_VERSION < 3 #if _WIN32 || wxMAJOR_VERSION < 3
return wxGetTranslation(message); return wxGetTranslation(message);
#else #else
wxString translation = wxGetTranslation( message ); return wxGetTranslation( message ).wc_str();
return translation.wc_str();
#endif #endif
} }