office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-25 02:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not delete m_annowindows directly

Browse source 
If we do that slotAnnotationWindowDestroyed bites us and the list gets out of sync
This commit is contained in:
Albert Astals Cid 2012-03-07 23:51:36 +01:00
parent d34bc7f263
commit 5e6e54dbb0
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ui/pageview.cpp
View file

@ -383,7 +383,13 @@ PageView::~PageView()
d->m_tts->stopAllSpeechs();
// delete the local storage structure
qDeleteAll(d->m_annowindows);
// We need to assign it to a different list otherwise slotAnnotationWindowDestroyed
// will bite us and clear d->m_annowindows
QHash< Okular::Annotation *, AnnotWindow * > annowindows = d->m_annowindows;
d->m_annowindows.clear();
qDeleteAll( annowindows );
// delete all widgets
QVector< PageViewItem * >::const_iterator dIt = d->items.constBegin(), dEnd = d->items.constEnd();
for ( ; dIt != dEnd; ++dIt )
@ -889,8 +895,11 @@ void PageView::notifySetup( const QVector< Okular::Page * > & pageSet, int setup
updateActionState( haspages, documentChanged, hasformwidgets );
qDeleteAll( d->m_annowindows );
// We need to assign it to a different list otherwise slotAnnotationWindowDestroyed
// will bite us and clear d->m_annowindows
QHash< Okular::Annotation *, AnnotWindow * > annowindows = d->m_annowindows;
d->m_annowindows.clear();
qDeleteAll( annowindows );
selectionClear();
}