diff options
author | Robert Griebl <[email protected]> | 2025-07-07 14:29:21 +0200 |
---|---|---|
committer | Robert Griebl <[email protected]> | 2025-07-07 14:33:35 +0200 |
commit | a6f414ee57132b585cc53878b87af7d3e21a678f (patch) | |
tree | 91e1b34c9a4c8798e49d610e1a9c33414a7ec269 | |
parent | ec66c6d898e7b4fced5d4e4c22948fe61607246c (diff) |
This piece of code should have been moved in the last refactoring, but
it got lost instead. This resulted in the main thread crashing instead
of being terminated cleanly by the watchdog.
Change-Id: Ieae95fc8c341763aefb0d54cb77bac96c2fe1b2e
Pick-to: 6.10 6.9 6.8
Reviewed-by: Dominik Holland <[email protected]>
-rw-r--r-- | src/shared-main-lib/watchdog.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/shared-main-lib/watchdog.cpp b/src/shared-main-lib/watchdog.cpp index c8d513d9..1fb8e15e 100644 --- a/src/shared-main-lib/watchdog.cpp +++ b/src/shared-main-lib/watchdog.cpp @@ -778,6 +778,8 @@ void Watchdog::eventCallback(const QThread *thread, bool begin, QObject *receive if (auto *eld = std::as_const(WatchdogPrivate::s_eventLoopData).localData()) { Q_ASSERT(eld->m_thread == thread); + if (!eld->m_threadHandle) + eld->m_threadHandle = currentThreadHandle(); d->eventNotify(eld, begin); } |