diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-04-30 17:42:25 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-04-30 17:42:25 +0300 |
| commit | 2479959dd9be78a74c10484c65094bd56d1c3d9e (patch) | |
| tree | 81a9eda176470aa56e13772919658b9f1c8aad57 | |
| parent | 0dc325502e5c7f44e1cf20315907275190396df3 (diff) | |
additional fix for EXT-4858 Normal "Detecting Hardware..." not showing correctly in non-English languages with Viewer 2.0
reviewed Mike Antipov
EXT-4858 "Detecting Hardware..." not showing correctly in non-English languages with Viewer 2.0
--HG--
branch : product-engine
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index a96ad7e796..f8fde0319e 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -2881,10 +2881,13 @@ void LLSplashScreenWin32::updateImpl(const std::string& mesg) if( output_str_len>1024 ) return; - WCHAR w_mesg[1024]; + WCHAR w_mesg[1025];//big enought to keep null terminatos MultiByteToWideChar (CP_UTF8, 0, mesg.c_str(), mesg.length(), w_mesg, output_str_len); + //looks like MultiByteToWideChar didn't add null terminator to converted string, see EXT-4858 + w_mesg[output_str_len] = 0; + SendDlgItemMessage(mWindow, 666, // HACK: text id WM_SETTEXT, |