mirror of
https://github.com/hrydgard/ppsspp.git
synced 2025-04-02 11:01:50 -04:00
SaveState: Correct crash on rewind usage.
Since the mutex is now non-recursive, make the Compress/Decompress API asymmetric.
This commit is contained in:
parent
19bf222ea4
commit
07ce4c213d
1 changed files with 2 additions and 3 deletions
|
@ -140,7 +140,7 @@ namespace SaveState
|
|||
return CChunkFileReader::ERROR_BAD_FILE;
|
||||
|
||||
static std::vector<u8> buffer;
|
||||
Decompress(buffer, states_[n], bases_[baseMapping_[n]]);
|
||||
LockedDecompress(buffer, states_[n], bases_[baseMapping_[n]]);
|
||||
return LoadFromRam(buffer);
|
||||
}
|
||||
|
||||
|
@ -174,9 +174,8 @@ namespace SaveState
|
|||
}
|
||||
}
|
||||
|
||||
void Decompress(std::vector<u8> &result, const std::vector<u8> &compressed, const std::vector<u8> &base)
|
||||
void LockedDecompress(std::vector<u8> &result, const std::vector<u8> &compressed, const std::vector<u8> &base)
|
||||
{
|
||||
std::lock_guard<std::mutex> guard(lock_);
|
||||
result.clear();
|
||||
result.reserve(base.size());
|
||||
auto basePos = base.begin();
|
||||
|
|
Loading…
Add table
Reference in a new issue