From 2882ba419c90452d17989d0b6b61ca8d74b4ef67 Mon Sep 17 00:00:00 2001
From: Ianos Gnatiuc <ssianky@users.sourceforge.net>
Date: Thu, 25 May 2006 05:29:05 +0000
Subject: [PATCH] ReadFindNext will work like ReadFindAll on first usage.

---
 docs/notework.rus  |  2 ++
 docs/notework.txt  |  3 +++
 golded3/geread.cpp | 19 ++++++++-----------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/docs/notework.rus b/docs/notework.rus
index 66fa240..e420ab0 100644
--- a/docs/notework.rus
+++ b/docs/notework.rus
@@ -10,6 +10,8 @@ _____________________________________________________________________________
                Заметки для GoldED+ 1.1.5, /snapshot/
 _____________________________________________________________________________
 
++ При первом нажатии на ReadFindNext и если ReadFindAll/ReadFindHeader не были
+  использованы перед этим, тогда он будет работать как ReadFindAll.
 + Улучшена логика "плавающих" деревьев ответов (см. ReplyLinkFloat).
 + Дерево ответов генерируется немного быстрее.
 
diff --git a/docs/notework.txt b/docs/notework.txt
index 2696892..074d2c7 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -10,6 +10,9 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
++ On first pressing ReadFindNext key and ReadFindAll/ReadFindHeader was
+  not pressed before, it will work like ReadFindAll key.
+
 + Improved floating reply threads logic (see ReplyLinkFloat).
 
 + Reply tread is generated a bit faster.
diff --git a/golded3/geread.cpp b/golded3/geread.cpp
index 7ecb1e8..eba866e 100644
--- a/golded3/geread.cpp
+++ b/golded3/geread.cpp
@@ -218,8 +218,10 @@ void Reader() {
     BodyView->highlight_color = C_READH;
     BodyView->Create();
 
-    do {
-
+    do
+    {
+      AA->set_findfirst(true);
+      AA->set_findtype(1);
       AA->isreadpm = false;
       AA->isreadmark = false;
       reader_direction = DIR_NEXT;
@@ -824,16 +826,11 @@ void Reader() {
                 break;
 
               case KK_ReadFindNext:
-                if (!AA->get_findfirst())
-                {
-                  if (AA->get_findtype() == 1)
-                    FindAll(msg, reader_topline, reader_keyok);
-                  else
-                    FindHdr(msg, reader_topline, reader_keyok);
-                }
+                if (AA->get_findtype() == 1)
+                  FindAll(msg, reader_topline, reader_keyok);
                 else
-                  reader_keyok = false;
-              break;
+                  FindHdr(msg, reader_topline, reader_keyok);
+                break;
 
               case KK_ReadSearch:
                 AdvancedSearch(msg, reader_topline, reader_keyok);