diff options
| author | comex <comexk@gmail.com> | 2015-06-02 20:28:25 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2015-06-02 20:28:25 -0400 |
| commit | 2ae6fb9240ffd0a25727bede295d0d3afa3cab0c (patch) | |
| tree | e02ba90b4531807a39839857dcf3da8fa28d6666 /Source/Core/DiscIO/FileMonitor.cpp | |
| parent | 36b554613ce15246bd37570a87b973ffcaa9b160 (diff) | |
| parent | d43a920924b11a825d474f75cba3996b676bb731 (diff) | |
Merge pull request #2338 from JosJuice/getfilelist-return
Filesystem: Return file list reference instead of modifying argument
Diffstat (limited to 'Source/Core/DiscIO/FileMonitor.cpp')
| -rw-r--r-- | Source/Core/DiscIO/FileMonitor.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/Core/DiscIO/FileMonitor.cpp b/Source/Core/DiscIO/FileMonitor.cpp index 61bbace2da..7a3c28fd8a 100644 --- a/Source/Core/DiscIO/FileMonitor.cpp +++ b/Source/Core/DiscIO/FileMonitor.cpp @@ -27,7 +27,6 @@ namespace FileMon static DiscIO::IVolume *OpenISO = nullptr; static DiscIO::IFileSystem *pFileSystem = nullptr; -static std::vector<const DiscIO::SFileInfo *> DiscFiles; static std::string ISOFile = "", CurrentFile = ""; static bool FileAccess = true; @@ -73,8 +72,6 @@ void ReadFileSystem(const std::string& filename) pFileSystem = nullptr; } - // DiscFiles' pointers are no longer valid after pFileSystem is cleared - DiscFiles.clear(); OpenISO = DiscIO::CreateVolumeFromFilename(filename); if (!OpenISO) return; @@ -85,8 +82,6 @@ void ReadFileSystem(const std::string& filename) if (!pFileSystem) return; - - pFileSystem->GetFileList(DiscFiles); } FileAccess = true; @@ -166,9 +161,6 @@ void Close() pFileSystem = nullptr; } - // DiscFiles' pointers are no longer valid after pFileSystem is cleared - DiscFiles.clear(); - ISOFile = ""; CurrentFile = ""; FileAccess = true; |