Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 2 files). Show all
Unified · Split
| @@ -470,7 +470,10 @@ void ScriptEngine::waitTillDoneRunning(bool shutdown) { · 469 unmodified lines | |||
| 470 | // We should never be waiting (blocking) on our own thread | 470 | // We should never be waiting (blocking) on our own thread |
| 471 | assert(workerThread != QThread::currentThread()); | 471 | assert(workerThread != QThread::currentThread()); |
| 472 | 472 | ||
| 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 | // | ||
| 474 | // On mac, don't call QCoreApplication::processEvents() here. This is to prevent | 477 | // On mac, don't call QCoreApplication::processEvents() here. This is to prevent |
| 475 | // [NSApplication terminate:] from prematurely destroying the static destructors | 478 | // [NSApplication terminate:] from prematurely destroying the static destructors |
| 476 | // while we are waiting for the scripts to shutdown. We will pump the message | 479 | // while we are waiting for the scripts to shutdown. We will pump the message |