From f6f6b5604afd9d6269cc0aed93bb47f05107d0de Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 1 Jun 2014 23:11:38 +0200
Subject: [PATCH] Fix loading a savegame when some of its content files were
 disabled

Fixes #1380
---
 apps/openmw/mwworld/cells.cpp   | 2 ++
 apps/openmw/mwworld/globals.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index 3b758f8660..16c1b497cd 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -314,6 +314,8 @@ bool MWWorld::Cells::readRecord (ESM::ESMReader& reader, int32_t type,
         catch (...)
         {
             // silently drop cells that don't exist anymore
+            reader.skipRecord();
+            return true;
             /// \todo log
         }
 
diff --git a/apps/openmw/mwworld/globals.cpp b/apps/openmw/mwworld/globals.cpp
index 663af640b8..15ba274980 100644
--- a/apps/openmw/mwworld/globals.cpp
+++ b/apps/openmw/mwworld/globals.cpp
@@ -100,7 +100,7 @@ namespace MWWorld
             if (iter!=mVariables.end())
                 iter->second.read (reader, ESM::Variant::Format_Global);
             else
-                reader.skipHRecord();
+                reader.skipRecord();
 
             return true;
         }