From 2fc40abca0c7d7eb3c2b555e91fcb3a98c73aa39 Mon Sep 17 00:00:00 2001 From: anders_k Date: Thu, 14 Mar 2013 22:27:48 +0000 Subject: [PATCH] Allow CP_ACP as the codepage in NLF files even if IsValidCodePage() says no git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6301 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/lang.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/lang.cpp b/Source/lang.cpp index 91e5ac26..1d7922be 100644 --- a/Source/lang.cpp +++ b/Source/lang.cpp @@ -1019,9 +1019,9 @@ l_readerr: if (!GetNextNLFLine(lr, buf, NSIS_MAX_STRLEN, errlr)) goto l_readerr; if (buf[0] != _T('-') || buf[1] != 0) { nlf->m_uCodePage = _ttoi(buf); - if (!IsValidCodePage(nlf->m_uCodePage)) + if (!IsValidCodePage(nlf->m_uCodePage) && CP_ACP != nlf->m_uCodePage) { - warning_fl(_T("%s language file uses a codepage that is not supported on this system, using ACP!"), nlf->m_szName); + warning_fl(_T("%s language file uses a codepage (%d) that is not supported on this system, using ACP!"), nlf->m_szName, nlf->m_uCodePage); nlf->m_uCodePage = CP_ACP; } }