Merge branch 'fix_navigator_nullptr' into 'master'

Use navigator in world destructor only when initialized

See merge request OpenMW/openmw!4477
master
psi29a 3 weeks ago
commit bc02a4a9ca

@ -602,7 +602,7 @@ namespace MWWorld
if (mProjectileManager) if (mProjectileManager)
mProjectileManager->clear(); mProjectileManager->clear();
if (Settings::navigator().mWaitForAllJobsOnExit) if (Settings::navigator().mWaitForAllJobsOnExit && mNavigator != nullptr)
{ {
Log(Debug::Verbose) << "Waiting for all navmesh jobs to be done..."; Log(Debug::Verbose) << "Waiting for all navmesh jobs to be done...";
mNavigator->wait(DetourNavigator::WaitConditionType::allJobsDone, nullptr); mNavigator->wait(DetourNavigator::WaitConditionType::allJobsDone, nullptr);

Loading…
Cancel
Save