diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-03-04 15:38:43 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-03-04 15:47:56 -0600 |
| commit | f3f89e1d00171ac476fc06e605518747c50ab407 (patch) | |
| tree | 1c1fd0bed94887cd03e70d3f8477d2892a5ff044 /Source/Core/Common/Src/MsgHandler.cpp | |
| parent | bf58c70e9b5a16c56113fe5114a845f8000d4a9d (diff) | |
| parent | 0041ec618c46ea2bf99fb1fc068e7c4a263cb4c2 (diff) | |
Merge branch 'master' into vertex-loader-cleanup
Conflicts:
Source/Core/Common/Src/CommonFuncs.h
Source/Core/VideoCommon/Src/VertexLoader.cpp
Diffstat (limited to 'Source/Core/Common/Src/MsgHandler.cpp')
| -rw-r--r-- | Source/Core/Common/Src/MsgHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/MsgHandler.cpp b/Source/Core/Common/Src/MsgHandler.cpp index 7c666227aa..283dc72ef1 100644 --- a/Source/Core/Common/Src/MsgHandler.cpp +++ b/Source/Core/Common/Src/MsgHandler.cpp @@ -106,7 +106,7 @@ bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int S if (Style == QUESTION) STYLE = MB_ICONQUESTION; if (Style == WARNING) STYLE = MB_ICONWARNING; - return IDYES == MessageBox(0, text, caption, STYLE | (yes_no ? MB_YESNO : MB_OK)); + return IDYES == MessageBox(0, UTF8ToTStr(text).c_str(), UTF8ToTStr(caption).c_str(), STYLE | (yes_no ? MB_YESNO : MB_OK)); #else printf("%s\n", text); |
