Merge branch 'fix_navigator_nullptr' into 'master'

psi29a · psi29a · commit bc02a4a9caec · 2024-12-08T10:10:00.000Z
Use navigator in world destructor only when initialized

See merge request OpenMW/openmw!4477
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ namespace MWWorld`
`602`	`602`	`if (mProjectileManager)`
`603`	`603`	`mProjectileManager->clear();`
`604`	`604`
`605`		`- if (Settings::navigator().mWaitForAllJobsOnExit)`
	`605`	`+ if (Settings::navigator().mWaitForAllJobsOnExit && mNavigator != nullptr)`
`606`	`606`	`{`
`607`	`607`	`Log(Debug::Verbose) << "Waiting for all navmesh jobs to be done...";`
`608`	`608`	`mNavigator->wait(DetourNavigator::WaitConditionType::allJobsDone, nullptr);`