whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QBasicTimer: release timer id on exit 

In some cases of inheritance, timer deletion can be triggered from the
event dispatcher destructor where QThreadData::eventDispatcher is
already nullptr. Despite the fact that the application is in shutdown
phase, we should free the resource.

Change-Id: I61ed1d817fd7638953f7d629823f19d4f6f1ee00
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Alex Trotsenko 2019-11-08 19:37:51 +02:00
parent 38f38c7188
commit 79a1fc0e01
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/kernel/qbasictimer.cpp
View File

@ -216,13 +216,11 @@ void QBasicTimer::stop()
{
if (id) {
QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance();
if (eventDispatcher) {
if (Q_UNLIKELY(!eventDispatcher->unregisterTimer(id))) {
qWarning("QBasicTimer::stop: Failed. Possibly trying to stop from a different thread");
return;
}
QAbstractEventDispatcherPrivate::releaseTimerId(id);
if (eventDispatcher && !eventDispatcher->unregisterTimer(id)) {
qWarning("QBasicTimer::stop: Failed. Possibly trying to stop from a different thread");
return;
}
QAbstractEventDispatcherPrivate::releaseTimerId(id);
}
id = 0;
}