diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index 53905fdd..850e851d 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -1424,7 +1424,7 @@ int FindReplaceDlg::processAll(ProcessOperation op, const FindOption *opt, bool endPosition = docLength; } - return processRange(op, txt2find, txt2replace, startPosition, endPosition, fileName, opt, colourStyleID); + return processRange(op, txt2find, txt2replace, startPosition, endPosition, fileName, pOptions, colourStyleID); } int FindReplaceDlg::processRange(ProcessOperation op, const TCHAR *txt2find, const TCHAR *txt2replace, int startRange, int endRange, const TCHAR *fileName, const FindOption *opt, int colourStyleID) @@ -2068,6 +2068,9 @@ void FindReplaceDlg::initOptionsFromDlg() _options._doMarkLine = isCheckedOrNot(IDC_MARKLINE_CHECK); _options._doStyleFoundToken = isCheckedOrNot(IDC_STYLEFOUND_CHECK); + _options._isRecursive = isCheckedOrNot(IDD_FINDINFILES_RECURSIVE_CHECK); + _options._isInHiddenDir = isCheckedOrNot(IDD_FINDINFILES_INHIDDENDIR_CHECK); + ::EnableWindow(::GetDlgItem(_hSelf, IDCMARKALL), (_options._doMarkLine || _options._doStyleFoundToken)); } diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h index 8bdeabaf..f17cb266 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h @@ -82,7 +82,7 @@ struct FindOption FindOption() : _isWholeWord(true), _isMatchCase(true), _searchType(FindNormal),\ _isWrapAround(true), _whichDirection(DIR_DOWN), _incrementalType(NotIncremental), _doPurge(false), _doMarkLine(false), _doStyleFoundToken(false), - _isInSelection(false), _isRecursive(false), _isInHiddenDir(false), + _isInSelection(false), _isRecursive(true), _isInHiddenDir(false), _filters(TEXT("")), _directory(TEXT("")) {}; };