bFindAllWasUsingLogOutput should not be TRUE without QS_FINDALL_RSLT_POS

d0vgan · Dec 4, 2024 · d997786 · d997786
1 parent 9ab3dda
commit d997786
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/Docs/QSearch-Eng.txt b/Docs/QSearch-Eng.txt
@@ -88,6 +88,11 @@ Recommended hot-key - F4.
 (When the Find All results are shown by the Log::Output panel,
 GoToNextFindAllMatch actually calls Log::Output::NextMatch.
 If the Log::Output panel is closed, GoToNextFindAllMatch works independently).
+Note: QSearch remembers its Find All matches until the next Find All search has
+been started or until some searched file has been modified. Correspondingly,
+it is possible to search for another string by means of F3/FindNext/FindPrev
+and, in the same time, to use GoToNextFindAllMatch/GoToPrevFindAllMatch to go
+to the match from the last Find All results.
 
 GoToPrevFindAllMatch - jumps to the previous match of the Find All results.
 Recommended hot-key - Shift+F4.

diff --git a/Docs/QSearch-Rus.txt b/Docs/QSearch-Rus.txt
@@ -88,6 +88,11 @@ GoToNextFindAllMatch -
 (����� ���������� "����� ���" ������������ � ������ Log::Output,
 �� GoToNextFindAllMatch �� ����� ���� �������� Log::Output::NextMatch.
 ���� ������ Log::Output �������, GoToNextFindAllMatch �������� ����������).
+����������: QSearch ������ ���������� �� ����������� "����� ���" �� ��� ���,
+���� �� ��� ����� ����� ����� "����� ���" ��� ���� �����-�� �� ������ �
+������������ �� ��� �������. ��������������, ����� ������ ������ (�����) ������
+� ������� F3/FindNext/FindPrev, ������������ ��������� GoToNextFindAllMatch �
+GoToPrevFindAllMatch ��� �������� � ���������� �� ��������� ����������� "����� ���".
 
 GoToPrevFindAllMatch - ������� � ����������� ���������� �� ����������� "����� ���".
 ������������� "������� �������" - Shift+F4.

diff --git a/Source/QSearch/QSearchDlg.c b/Source/QSearch/QSearchDlg.c
@@ -6984,7 +6984,8 @@ void qsearchDoSearchText(HWND hEdit, const wchar_t* cszFindWhatAW, DWORD dwParam
                 {
                     g_QSearchDlg.nGoToNextFindAllPosToCompare = -1;
 
-                    if ( pFindAll->ShowFindResults.pfnInit == qsShowFindResults_LogOutput_Init )
+                    if ( pFindAll->ShowFindResults.pfnInit == qsShowFindResults_LogOutput_Init && 
+                         (FindContext.dwFindAllResult & (QS_FINDALL_RSLT_POS | QS_FINDALL_FILTERMODE)) == QS_FINDALL_RSLT_POS )
                         g_QSearchDlg.bFindAllWasUsingLogOutput = TRUE;
                     else
                         g_QSearchDlg.bFindAllWasUsingLogOutput = FALSE;