Merge remote-tracking branch 'origin/10.0'

Change-Id: I7bd186df0bfae7906e980e9c2c811f8dcf29750d
This commit is contained in:
Eike Ziller
2023-03-02 10:17:58 +01:00
49 changed files with 936 additions and 377 deletions

View File

@@ -380,6 +380,10 @@ public:
void doShutdownEngine()
{
m_engine->setState(EngineShutdownRequested);
if (m_engine->isDying()) {
m_engine->notifyEngineShutdownFinished();
return;
}
m_engine->startDying();
m_engine->showMessage("CALL: SHUTDOWN ENGINE");
m_engine->shutdownEngine();