From 3c3d4373ab8c1fd5af23d320ac80eca4538c0151 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sat, 10 May 2014 10:04:47 +0200 Subject: [PATCH] Do not reset the search if it's a different search id Doesn't make any sense, why would we want a "running searches map" if we always reset the previous one? BUGS: 334568 FIXED-IN: 4.13.2 --- core/document.cpp | 5 ----- core/document_p.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/core/document.cpp b/core/document.cpp index 81982e08b..ceee726cb 100644 --- a/core/document.cpp +++ b/core/document.cpp @@ -3295,11 +3295,6 @@ void Document::searchText( int searchID, const QString & text, bool fromStart, Q search->continueOnPage = -1; searchIt = d->m_searches.insert( searchID, search ); } - if (d->m_lastSearchID != searchID) - { - resetSearch(d->m_lastSearchID); - } - d->m_lastSearchID = searchID; RunningSearch * s = *searchIt; // update search structure diff --git a/core/document_p.h b/core/document_p.h index ac5499090..62b4d4e8a 100644 --- a/core/document_p.h +++ b/core/document_p.h @@ -80,7 +80,6 @@ class DocumentPrivate public: DocumentPrivate( Document *parent ) : m_parent( parent ), - m_lastSearchID( -1 ), m_tempFile( 0 ), m_docSize( -1 ), m_allocatedPixmapsTotalMemory( 0 ), @@ -190,7 +189,6 @@ class DocumentPrivate // find descriptors, mapped by ID (we handle multiple searches) QMap< int, RunningSearch * > m_searches; - int m_lastSearchID; bool m_searchCancelled; // needed because for remote documents docFileName is a local file and