CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-17 21:03:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ fix: grepWinNP3: fix missing search flags

Browse Source
This commit is contained in:
Rainer Kottenhoff 2021-04-03 11:32:31 +02:00
parent b639f3618c
commit 3455e12703
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grepWinNP3/src/SearchDlg.cpp
View File

@ -3810,7 +3810,7 @@ int CSearchDlg::SearchFile(std::shared_ptr<CSearchInfo> sinfoPtr, const std::wst
// in any case, use the search function that uses a file iterator
// instead of a string iterator to reduce the memory consumption
if ((type != CTextFile::Binary) || (searchFlags.bIncludeBinary) || searchFlags.bSearchAlways /* @@@|| m_bForceBinary */)
if ((type != CTextFile::Binary) || searchFlags.bIncludeBinary || searchFlags.bSearchAlways || searchFlags.bForceBinary)
{
sinfoPtr->encoding = type;
std::string filePath = CUnicodeUtils::StdGetANSI(sinfoPtr->filePath);
@ -3856,7 +3856,7 @@ int CSearchDlg::SearchFile(std::shared_ptr<CSearchInfo> sinfoPtr, const std::wst
bFound = true;
}
}
if (type == CTextFile::Binary /* @@@ && !m_bReplace */)
if ((type == CTextFile::Binary) && !searchFlags.bReplace)
{
boost::regex expressionUtf16le = boost::regex(CUnicodeUtils::StdGetUTF8(searchStringUtf16le), ft);
boost::spirit::classic::file_iterator<> start(filePath.c_str());