From 129d68e2999893e91ebd577dd03b76ca666980f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Thu, 3 Mar 2022 20:24:52 +0200
Subject: [PATCH] Fix #6660: Crash during intro video when closing the game

---
 apps/openmw/mwrender/landmanager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/landmanager.cpp b/apps/openmw/mwrender/landmanager.cpp
index 560c1ba720..6af1d9782c 100644
--- a/apps/openmw/mwrender/landmanager.cpp
+++ b/apps/openmw/mwrender/landmanager.cpp
@@ -25,7 +25,10 @@ osg::ref_ptr<ESMTerrain::LandObject> LandManager::getLand(int x, int y)
         return static_cast<ESMTerrain::LandObject*>(obj.get());
     else
     {
-        const ESM::Land* land = MWBase::Environment::get().getWorld()->getStore().get<ESM::Land>().search(x,y);
+        const auto* world = MWBase::Environment::get().getWorld();
+        if (!world)
+            return nullptr;
+        const ESM::Land* land = world->getStore().get<ESM::Land>().search(x,y);
         if (!land)
             return nullptr;
         osg::ref_ptr<ESMTerrain::LandObject> landObj (new ESMTerrain::LandObject(land, mLoadFlags));