From 563210633ff3342bc47e5e430336b13eaeb95db9 Mon Sep 17 00:00:00 2001 From: Jochen Tucht Date: Tue, 16 Oct 2007 05:59:24 +0000 Subject: [PATCH] Patch #1804762 continued --- Src/Common/LanguageSelect.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Src/Common/LanguageSelect.cpp b/Src/Common/LanguageSelect.cpp index d9250d8c3..a7f707899 100644 --- a/Src/Common/LanguageSelect.cpp +++ b/Src/Common/LanguageSelect.cpp @@ -21,7 +21,7 @@ // Using C locale gets us direct mapping to Unicode codepoints #pragma setlocale("C") -#define LANG_PO(LANG, PO) LANG +#define LANG_PO(LANG, PO) PO // Sanity-check definition of LANG_PO macro #if LANG_PO(TRUE, FALSE) && !LANG_PO(FALSE, TRUE) @@ -772,13 +772,15 @@ bool CLanguageSelect::TranslateString(size_t line, std::wstring &ws) const #if LANG_PO(FALSE, TRUE) // compiling for use with .PO files if (line > 0 && line < m_strarray.size()) { - int len = m_strarray[line].length(); - ws.resize(len); - const char *msgstr = m_strarray[line].c_str(); - len = MultiByteToWideChar(m_codepage, 0, msgstr, -1, ws.begin(), len + 1); - ASSERT(*msgstr == 0 || len != 0); - ws.resize(len - 1); - return true; + if (int len = m_strarray[line].length()) + { + ws.resize(len); + const char *msgstr = m_strarray[line].c_str(); + len = MultiByteToWideChar(m_codepage, 0, msgstr, -1, ws.begin(), len + 1); + ASSERT(*msgstr == 0 || len != 0); + ws.resize(len - 1); + return true; + } } #endif return false; -- 2.11.0