feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

android: fix call TaskHub::addTask from wrong thread

Browse Source 
Fixes: QTCREATORBUG-27105
Change-Id: I3be5e09e66642f8405979f601eee0db7b6a530e8
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-06-16 14:27:30 +02:00
parent e3fd840f98
commit 35707f8674
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/taskhub.cpp
View File

@@ -153,11 +153,18 @@ void TaskHub::addTask(Task::TaskType type, const QString &description, Utils::Id
void TaskHub::addTask(Task task) void TaskHub::addTask(Task task)
{ {
if (QThread::currentThread() != qApp->thread()) {
QMetaObject::invokeMethod(qApp, [&task] {
TaskHub::addTask(task);
});
return;
}
QTC_ASSERT(m_registeredCategories.contains(task.category), return); QTC_ASSERT(m_registeredCategories.contains(task.category), return);
QTC_ASSERT(!task.description().isEmpty(), return); QTC_ASSERT(!task.description().isEmpty(), return);
QTC_ASSERT(!task.isNull(), return); QTC_ASSERT(!task.isNull(), return);
QTC_ASSERT(task.m_mark.isNull(), return); QTC_ASSERT(task.m_mark.isNull(), return);
QTC_ASSERT(QThread::currentThread() == qApp->thread(), return);
if (task.file.isEmpty() || task.line <= 0) if (task.file.isEmpty() || task.line <= 0)
task.line = -1; task.line = -1;