mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-27 11:40:07 +00:00
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
This commit is contained in:
parent
e514ddbf78
commit
3c3d4373ab
|
@ -3295,11 +3295,6 @@ void Document::searchText( int searchID, const QString & text, bool fromStart, Q
|
||||||
search->continueOnPage = -1;
|
search->continueOnPage = -1;
|
||||||
searchIt = d->m_searches.insert( searchID, search );
|
searchIt = d->m_searches.insert( searchID, search );
|
||||||
}
|
}
|
||||||
if (d->m_lastSearchID != searchID)
|
|
||||||
{
|
|
||||||
resetSearch(d->m_lastSearchID);
|
|
||||||
}
|
|
||||||
d->m_lastSearchID = searchID;
|
|
||||||
RunningSearch * s = *searchIt;
|
RunningSearch * s = *searchIt;
|
||||||
|
|
||||||
// update search structure
|
// update search structure
|
||||||
|
|
|
@ -80,7 +80,6 @@ class DocumentPrivate
|
||||||
public:
|
public:
|
||||||
DocumentPrivate( Document *parent )
|
DocumentPrivate( Document *parent )
|
||||||
: m_parent( parent ),
|
: m_parent( parent ),
|
||||||
m_lastSearchID( -1 ),
|
|
||||||
m_tempFile( 0 ),
|
m_tempFile( 0 ),
|
||||||
m_docSize( -1 ),
|
m_docSize( -1 ),
|
||||||
m_allocatedPixmapsTotalMemory( 0 ),
|
m_allocatedPixmapsTotalMemory( 0 ),
|
||||||
|
@ -190,7 +189,6 @@ class DocumentPrivate
|
||||||
|
|
||||||
// find descriptors, mapped by ID (we handle multiple searches)
|
// find descriptors, mapped by ID (we handle multiple searches)
|
||||||
QMap< int, RunningSearch * > m_searches;
|
QMap< int, RunningSearch * > m_searches;
|
||||||
int m_lastSearchID;
|
|
||||||
bool m_searchCancelled;
|
bool m_searchCancelled;
|
||||||
|
|
||||||
// needed because for remote documents docFileName is a local file and
|
// needed because for remote documents docFileName is a local file and
|
||||||
|
|
Loading…
Reference in a new issue