Commit 3c3d4373 authored by Albert Astals Cid's avatar Albert Astals Cid

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
parent e514ddbf
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment