From d3d04171f9f1c80cfce59ed99a3e66da8fa57770 Mon Sep 17 00:00:00 2001
From: Kyle Cooley <kyleacooley@gmail.com>
Date: Tue, 22 Aug 2017 15:06:56 -0400
Subject: [PATCH] Fix seg fault, undo changes BsaArchive

---
 apps/opencs/view/render/cell.cpp |  3 ++-
 components/vfs/bsaarchive.cpp    | 20 +++++++-------------
 components/vfs/bsaarchive.hpp    |  3 ---
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index a10e38397..153de773c 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -297,7 +297,8 @@ void CSVRender::Cell::reloadAssets()
         mTerrain->loadCell(mCoordinates.getX(), mCoordinates.getY());
     }
 
-    mCellWater->reloadAssets();
+    if (mCellWater)
+        mCellWater->reloadAssets();
 }
 
 void CSVRender::Cell::setSelection (int elementMask, Selection mode)
diff --git a/components/vfs/bsaarchive.cpp b/components/vfs/bsaarchive.cpp
index 9b686049f..a527a6ad9 100644
--- a/components/vfs/bsaarchive.cpp
+++ b/components/vfs/bsaarchive.cpp
@@ -5,9 +5,14 @@ namespace VFS
 
 
 BsaArchive::BsaArchive(const std::string &filename)
-    : mFileName(filename)
 {
-    load();
+    mFile.open(filename);
+
+    const Bsa::BSAFile::FileList &filelist = mFile.getList();
+    for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it)
+    {
+        mResources.push_back(BsaArchiveFile(&*it, &mFile));
+    }
 }
 
 void BsaArchive::listResources(std::map<std::string, File *> &out, char (*normalize_function)(char))
@@ -21,17 +26,6 @@ void BsaArchive::listResources(std::map<std::string, File *> &out, char (*normal
     }
 }
 
-void BsaArchive::load()
-{
-    mFile.open(mFileName);
-
-    const Bsa::BSAFile::FileList &filelist = mFile.getList();
-    for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it)
-    {
-        mResources.push_back(BsaArchiveFile(&*it, &mFile));
-    }
-}
-
 // ------------------------------------------------------------------------------
 
 BsaArchiveFile::BsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::BSAFile* bsa)
diff --git a/components/vfs/bsaarchive.hpp b/components/vfs/bsaarchive.hpp
index 217594abd..a6e274037 100644
--- a/components/vfs/bsaarchive.hpp
+++ b/components/vfs/bsaarchive.hpp
@@ -27,9 +27,6 @@ namespace VFS
         virtual void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char));
 
     private:
-        void load();
-
-        std::string mFileName;
         Bsa::BSAFile mFile;
 
         std::vector<BsaArchiveFile> mResources;