office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 11:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.14'

Browse source
This commit is contained in:
Albert Astals Cid 2014-08-01 01:29:01 +02:00
parent faf63bfa2d b7af929e5e
commit 35a3f23709
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/document.cpp
View file

@ -2836,7 +2836,7 @@ void Document::requestPixmaps( const QLinkedList< PixmapRequest * > & requests,
if ( requests.isEmpty() )
return;
if ( !d->m_generator || d->m_closingLoop )
if ( !d->m_pageController )
{
// delete requests..
QLinkedList< PixmapRequest * >::const_iterator rIt = requests.constBegin(), rEnd = requests.constEnd();
@ -4425,7 +4425,7 @@ void DocumentPrivate::calculateMaxTextPages()
void DocumentPrivate::textGenerationDone( Page *page )
{
if ( !m_generator || m_closingLoop ) return;
if ( !m_pageController ) return;
// 1. If we reached the cache limit, delete the first text page from the fifo
if (m_allocatedTextPagesFifo.size() == m_maxAllocatedTextPages)