diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2021-10-07 13:37:24 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2021-11-11 17:24:35 +0200 |
| commit | 966f7cb5dddfe87f23701c12eeb071bd798a9e40 (patch) | |
| tree | 7e03c763c8a6010cb1613b64eb7425956fdcfc45 /src/corelib/kernel | |
| parent | e6db4206b81f3fcea13646461f56a5207d9608c2 (diff) | |
wasm: make timers work for the new event dispatcher
Don’t exit from the timer callback if there is no main
thread event dispatcher, since it could be that the main
thread event dispatcher is of the old event dispatcher type.
Pick-to: 6.2
Change-Id: Ibb7a34a99e2001b52d2a985022f5baa7cd2152bf
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_wasm.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_wasm.cpp b/src/corelib/kernel/qeventdispatcher_wasm.cpp index a6384d251e..15ada58aad 100644 --- a/src/corelib/kernel/qeventdispatcher_wasm.cpp +++ b/src/corelib/kernel/qeventdispatcher_wasm.cpp @@ -526,9 +526,6 @@ void QEventDispatcherWasm::callProcessTimers(void *context) { Q_ASSERT(emscripten_is_main_runtime_thread()); - // Bail out if Qt has been shut down - if (!g_mainThreadEventDispatcher) - return; // Note: "context" may be a stale pointer here, // take care before casting and dereferencing! |