History

Fix OSX crash on shutdown

David Rowe committed 5 years ago

Commit 5ad2f9d1 parent ba54dd72 files · +6 −1Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+4−1
@@ -470,7 +470,10 @@ void ScriptEngine::waitTillDoneRunning(bool shutdown) { · 469 unmodified lines
470470 // We should never be waiting (blocking) on our own thread
471471 assert(workerThread != QThread::currentThread());
472472
473−#ifdef Q_OS_MAC
473+#if 0
474+ // 26 Feb 2021 - Disabled this OSX-specific code because it causes OSX to crash on shutdown; without this code, OSX
475+ // doesn't crash on shutdown. Qt 5.12.3 and Qt 5.15.2.
476+ //
474477 // On mac, don't call QCoreApplication::processEvents() here. This is to prevent
475478 // [NSApplication terminate:] from prematurely destroying the static destructors
476479 // while we are waiting for the scripts to shutdown. We will pump the message