mirror of
https://invent.kde.org/system/dolphin
synced 2024-11-05 18:47:12 +00:00
A crash occurs if updateItemStates runs between the
UpdateItemStatesThread finishing and the finished() signal being delivered. In this case, a new thread was not created, because the old thread still existed. However, pendingItemStatesUpdate was not set, because the thread was not running. Instead, the old thread was restarted. This meant that the finished() signal from the first run could be delivered while the thread was running for a second time, causing the thread to be deleted while still running and thus a crash. Solution: set pendingItemStatesUpdate if the thread is non-null, even if it is not running, knowing that slotThreadFinished has not yet run, and will call updateItemStates itself. BUG: 302264 FIXED-IN: 4.10 REVIEW: 107656
This commit is contained in:
parent
256792355d
commit
e7fe50bd3d
1 changed files with 1 additions and 1 deletions
|
@ -245,7 +245,7 @@ void VersionControlObserver::updateItemStates()
|
|||
connect(m_updateItemStatesThread, SIGNAL(finished()),
|
||||
m_updateItemStatesThread, SLOT(deleteLater()));
|
||||
}
|
||||
if (m_updateItemStatesThread->isRunning()) {
|
||||
else {
|
||||
// An update is currently ongoing. Wait until the thread has finished
|
||||
// the update (see slotThreadFinished()).
|
||||
m_pendingItemStatesUpdate = true;
|
||||
|
|
Loading…
Reference in a new issue