dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use a internal command to detect the CHM header because the !searchparse hack fails with a encoding error if the ACP codepage is 936.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6853 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2017-04-25 13:58:43 +00:00
parent c8370fd064
commit e004b5893e
3 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/script.cpp
View file

@ -3367,8 +3367,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
}
return PS_OK;
case TOK_P_PRAGMA:
parse_pragma(line); // Never abort with ERROR_MSG, even if the pragma is unknown/invalid
return PS_OK;
return parse_pragma(line) == PS_ERROR ? PS_ERROR : PS_OK;
case TOK_P_ERROR:
ERROR_MSG(_T("!error: %") NPRIs _T("\n"),line.gettoken_str(1));
return PS_ERROR;