fixed OpenCS crash during cell loading when loading multiple ESX files

12 years ago · 47f7bbd48a
parent e5e9c83ed5
commit 47f7bbd48a
2 changed files with 1 additions and 3 deletions
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@ -16,8 +16,6 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool

    Cell& cell2 = base ? cell.mBase : cell.mModified;

-    cell2.restore (reader, 0); /// \todo fix the index
-
    CellRef ref;

    while (cell2.getNextRef (reader, ref))
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@ -122,7 +122,7 @@ void Cell::save(ESMWriter &esm)

 void Cell::restore(ESMReader &esm, int iCtx) const
 {
-    esm.restoreContext(mContextList[iCtx]);
+    esm.restoreContext(mContextList.at (iCtx));
 }

 std::string Cell::getDescription() const