feat: check chat status before start a search

qTox · Aug 28, 2019 · ce57092 · ce57092
1 parent acb91ed
commit ce57092
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
@@ -940,7 +940,17 @@ void GenericChatForm::onSearchTriggered()
 
 void GenericChatForm::searchInBegin(const QString& phrase, const ParameterSearch& parameter)
 {
-    disableSearchText();
+    if (phrase.isEmpty()) {
+        disableSearchText();
+
+        return;
+    }
+
+    if (chatLog.getNextIdx().get() == messages.rbegin()->first.get() + 1) {
+        disableSearchText();
+    } else {
+        goToCurrentDate();
+    }
 
     if (!parameter.time.isNull()) {
         LoadHistoryDialog::LoadType type = (parameter.period == PeriodSearch::BeforeDate)
@@ -992,7 +1002,7 @@ void GenericChatForm::onSearchUp(const QString& phrase, const ParameterSearch& p
 
 void GenericChatForm::onSearchDown(const QString& phrase, const ParameterSearch& parameter)
 {
-    auto result = chatLog.searchForward(searchPos, phrase, parameter);    
+    auto result = chatLog.searchForward(searchPos, phrase, parameter);
 
     if (result.found && result.pos.logIdx.get() > messages.end()->first.get()) {
         const auto dt = chatLog.at(result.pos.logIdx).getTimestamp();