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

Cancel request when removing an observer

Browse source 
There's no need to continue generating something that won't be useful.
Also fixes a crash if the request would report partial updates since at that stage it uses the observer and that is gone
This commit is contained in:
Albert Astals Cid 2018-04-06 11:18:05 +02:00 committed by Albert Astals Cid
parent 09109dd649
commit d3c89a1505
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/document.cpp
View file

@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2005 by Enrico Ros <eros.kde@email.it> *
* Copyright (C) 2004-2008 by Albert Astals Cid <aacid@kde.org> *
* Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group *
* Copyright (C) 2017, 2018 Klarälvdalens Datakonsult AB, a KDAB Group *
* company, info@kdab.com. Work sponsored by the *
* LiMux project of the city of Munich *
* *
@ -2741,7 +2741,7 @@ void Document::addObserver( DocumentObserver * pObserver )
void Document::removeObserver( DocumentObserver * pObserver )
{
// remove observer from the map. it won't receive notifications anymore
// remove observer from the set. it won't receive notifications anymore
if ( d->m_observers.contains( pObserver ) )
{
// free observer's pixmap data
@ -2764,7 +2764,14 @@ void Document::removeObserver( DocumentObserver * pObserver )
++aIt;
}
// delete observer entry from the map
for ( PixmapRequest *executingRequest : qAsConst( d->m_executingPixmapRequests ) )
{
if ( executingRequest->observer() == pObserver ) {
d->cancelRenderingBecauseOf( executingRequest, nullptr );
}
}
// remove observer entry from the set
d->m_observers.remove( pObserver );
}
}