Skip to content

Commit

Permalink
Merge branch 'fix_navigator_nullptr' into 'master'
Browse files Browse the repository at this point in the history
Use navigator in world destructor only when initialized

See merge request OpenMW/openmw!4477
  • Loading branch information
psi29a committed Dec 8, 2024
2 parents c207397 + cb654a0 commit bc02a4a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion apps/openmw/mwworld/worldimp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ namespace MWWorld
if (mProjectileManager)
mProjectileManager->clear();

if (Settings::navigator().mWaitForAllJobsOnExit)
if (Settings::navigator().mWaitForAllJobsOnExit && mNavigator != nullptr)
{
Log(Debug::Verbose) << "Waiting for all navmesh jobs to be done...";
mNavigator->wait(DetourNavigator::WaitConditionType::allJobsDone, nullptr);
Expand Down

0 comments on commit bc02a4a

Please sign in to comment.