mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-26 22:38:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2338 from JosJuice/getfilelist-return

Browse source 
Filesystem: Return file list reference instead of modifying argument
This commit is contained in:
comex 2015-06-02 20:28:25 -04:00
commit 2ae6fb9240
7 changed files with 28 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/DiscIO/FileMonitor.cpp
View file

@ -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;