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

FolderMemoryCard: 4cbe9ad5ef happens for the file mod/access metadata time write too, fix that.

This commit is contained in:
Admiral H. Curtiss 2015-11-17 22:04:26 +01:00
parent 4cbe9ad5ef
commit 25064e86b8
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcsx2/gui/MemoryCardFolder.cpp
View File

@ -109,8 +109,8 @@ void FolderMemoryCard::Close( bool flush ) {
m_cache.clear();
m_oldDataCache.clear();
m_fileMetadataQuickAccess.clear();
m_lastAccessedFile.CloseAll();
m_fileMetadataQuickAccess.clear();
}
void FolderMemoryCard::LoadMemoryCardData( const u32 sizeInClusters, const bool enableFiltering, const wxString& filter ) {
@ -1399,7 +1399,10 @@ wxFFile* FileAccessHelper::Open( const wxFileName& folderName, MemoryCardFileMet
std::string internalPath;
fileRef->GetInternalPath( &internalPath );
m_files.emplace( internalPath, file );
MemoryCardFileHandleStructure handleStruct;
handleStruct.fileHandle = file;
handleStruct.fileRef = fileRef;
m_files.emplace( internalPath, handleStruct );
if ( writeMetadata ) {
fn.AppendDir( L"_pcsx2_meta" );
@ -1465,7 +1468,10 @@ wxFFile* FileAccessHelper::ReOpen( const wxFileName& folderName, MemoryCardFileM
}
}
return it->second;
// update the fileRef in the map since it might have been modified or deleted
it->second.fileRef = fileRef;
return it->second.fileHandle;
} else {
return this->Open( folderName, fileRef, writeMetadata );
}
@ -1489,9 +1495,9 @@ void FileAccessHelper::CloseMatching( const wxString& path ) {
fn.Normalize();
wxString pathNormalized = fn.GetFullPath();
for ( auto it = m_files.begin(); it != m_files.end(); ) {
wxString openPath = it->second->GetName();
wxString openPath = it->second.fileHandle->GetName();
if ( openPath.StartsWith( pathNormalized ) ) {
CloseFileHandle( it->second, nullptr );
CloseFileHandle( it->second.fileHandle, it->second.fileRef->entry );
it = m_files.erase( it );
} else {
++it;
@ -1501,14 +1507,14 @@ void FileAccessHelper::CloseMatching( const wxString& path ) {
void FileAccessHelper::CloseAll() {
for ( auto it = m_files.begin(); it != m_files.end(); ++it ) {
CloseFileHandle( it->second, nullptr );
CloseFileHandle( it->second.fileHandle, it->second.fileRef->entry );
}
m_files.clear();
}
void FileAccessHelper::FlushAll() {
for ( auto it = m_files.begin(); it != m_files.end(); ++it ) {
it->second->Flush();
it->second.fileHandle->Flush();
}
}

7
pcsx2/gui/MemoryCardFolder.h
View File

@ -202,13 +202,18 @@ struct MemoryCardFileMetadataReference {
void GetInternalPath( std::string* fileName ) const;
};
struct MemoryCardFileHandleStructure {
MemoryCardFileMetadataReference* fileRef;
wxFFile* fileHandle;
};
// --------------------------------------------------------------------------------------
// FileAccessHelper
// --------------------------------------------------------------------------------------
// Small helper class to keep memory card files opened between calls to Read()/Save()
class FileAccessHelper {
protected:
std::map<std::string, wxFFile*> m_files;
std::map<std::string, MemoryCardFileHandleStructure> m_files;
MemoryCardFileMetadataReference* m_lastWrittenFileRef; // we remember this to reduce redundant metadata checks/writes
public: