[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [okular/KDE/4.14] core: Fix sporadic crash when running parttest
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2014-07-31 23:28:24
Message-ID: E1XCzlo-0007SQ-VI () scm ! kde ! org
[Download RAW message or body]

Git commit b7af929e5ea72258d04a6c6b0b782f49c12acba7 by Albert Astals Cid.
Committed on 31/07/2014 at 23:27.
Pushed by aacid into branch 'KDE/4.14'.

Fix sporadic crash when running parttest

We use
  m_pageController
as guard for closing down instead of
  d->m_generator || d->m_closingLoop
since m_pageController is the first thing we set to 0 on closeDocument

M  +2    -2    core/document.cpp

http://commits.kde.org/okular/b7af929e5ea72258d04a6c6b0b782f49c12acba7

diff --git a/core/document.cpp b/core/document.cpp
index c37d397..921a7e8 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -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)


[prev in list] [next in list] [prev in thread] [next in thread]