ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FolderMemoryCard: When metadata in a memory card page changed to point at a different file than what it was on memory card load, the file handle cache that was introduced in 879d0c601f to prevent modification of currently loaded files would get confused and return the wrong file handle. Fixes #976.

This commit is contained in:
Admiral H. Curtiss 2015-11-17 21:14:55 +01:00
parent 186d58af01
commit 4cbe9ad5ef
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcsx2/gui/MemoryCardFolder.cpp
View File

@ -1396,7 +1396,10 @@ wxFFile* FileAccessHelper::Open( const wxFileName& folderName, MemoryCardFileMet
const MemoryCardFileEntry* const entry = fileRef->entry;
wxFFile* file = new wxFFile( filename, L"r+b" );
m_files.emplace( entry, file );
std::string internalPath;
fileRef->GetInternalPath( &internalPath );
m_files.emplace( internalPath, file );
if ( writeMetadata ) {
fn.AppendDir( L"_pcsx2_meta" );
@ -1444,7 +1447,9 @@ void FileAccessHelper::WriteMetadata( bool metadataIsNonstandard, wxFileName& me
}
wxFFile* FileAccessHelper::ReOpen( const wxFileName& folderName, MemoryCardFileMetadataReference* fileRef, bool writeMetadata ) {
auto it = m_files.find( fileRef->entry );
std::string internalPath;
fileRef->GetInternalPath( &internalPath );
auto it = m_files.find( internalPath );
if ( it != m_files.end() ) {
// we already have a handle to this file
@ -1486,7 +1491,7 @@ void FileAccessHelper::CloseMatching( const wxString& path ) {
for ( auto it = m_files.begin(); it != m_files.end(); ) {
wxString openPath = it->second->GetName();
if ( openPath.StartsWith( pathNormalized ) ) {
CloseFileHandle( it->second, it->first );
CloseFileHandle( it->second, nullptr );
it = m_files.erase( it );
} else {
++it;
@ -1496,7 +1501,7 @@ void FileAccessHelper::CloseMatching( const wxString& path ) {
void FileAccessHelper::CloseAll() {
for ( auto it = m_files.begin(); it != m_files.end(); ++it ) {
CloseFileHandle( it->second, it->first );
CloseFileHandle( it->second, nullptr );
}
m_files.clear();
}
@ -1547,6 +1552,17 @@ bool MemoryCardFileMetadataReference::GetPath( wxFileName* fileName ) const {
return parentCleaned || localCleaned;
}
void MemoryCardFileMetadataReference::GetInternalPath( std::string* fileName ) const {
if ( parent ) {
parent->GetInternalPath( fileName );
}
fileName->append( (const char*)entry->entry.data.name );
if ( entry->IsDir() ) {
fileName->append( "/" );
}
}
FolderMemoryCardAggregator::FolderMemoryCardAggregator() {
for ( uint i = 0; i < TotalCardSlots; ++i ) {

5
pcsx2/gui/MemoryCardFolder.h
View File

@ -197,6 +197,9 @@ struct MemoryCardFileMetadataReference {
// returns true if filename was modified and metadata containing the actual filename should be written
bool GetPath( wxFileName* fileName ) const;
// gives the internal memory card file system path, not to be used for writes to the host file system
void GetInternalPath( std::string* fileName ) const;
};
// --------------------------------------------------------------------------------------
@ -205,7 +208,7 @@ struct MemoryCardFileMetadataReference {
// Small helper class to keep memory card files opened between calls to Read()/Save()
class FileAccessHelper {
protected:
std::map<const MemoryCardFileEntry* const, wxFFile*> m_files;
std::map<std::string, wxFFile*> m_files;
MemoryCardFileMetadataReference* m_lastWrittenFileRef; // we remember this to reduce redundant metadata checks/writes
public: