Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Address feedback

Browse Source
This commit is contained in:
Henrik Rydgård 2023-02-14 10:09:22 +01:00
parent 2243ec5b31
commit cebb885e84
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/Serialize/Serializer.h
View File

@ -220,7 +220,9 @@ public:
*savedSize = measuredSize;
return ERROR_NONE;
} else {
free(data);
if (!*saved) {
free(data);
}
return ERROR_BROKEN_STATE;
}
}

17
Core/SaveState.cpp
View File

@ -120,7 +120,12 @@ namespace SaveState
CChunkFileReader::Error Save()
{
rewindLastTime = time_now_d();
rewindLastTime_ = time_now_d();
// Make sure we're not processing a previous save. That'll cause a hitch though, but at least won't
// crash due to contention over buffer_.
if (compressThread_.joinable())
compressThread_.join();
std::lock_guard<std::mutex> guard(lock_);
@ -166,7 +171,7 @@ namespace SaveState
static std::vector<u8> buffer;
LockedDecompress(buffer, states_[n], bases_[baseMapping_[n]]);
CChunkFileReader::Error error = LoadFromRam(buffer, errorString);
rewindLastTime = time_now_d();
rewindLastTime_ = time_now_d();
return error;
}
@ -257,7 +262,7 @@ namespace SaveState
buffer_.clear();
base_ = -1;
baseUsage_ = 0;
rewindLastTime = time_now_d();
rewindLastTime_ = time_now_d();
}
bool Empty() const
@ -272,7 +277,7 @@ namespace SaveState
// For fast-forwarding, otherwise they may be useless and too close.
double now = time_now_d();
double diff = now - rewindLastTime;
double diff = now - rewindLastTime_;
if (diff < g_Config.iRewindSnapshotInterval)
return;
@ -282,7 +287,7 @@ namespace SaveState
void NotifyState() {
// Prevent saving snapshots immediately after loading or saving a state.
rewindLastTime = time_now_d();
rewindLastTime_ = time_now_d();
}
private:
@ -307,7 +312,7 @@ namespace SaveState
int base_ = -1;
int baseUsage_ = 0;
double rewindLastTime = 0.0f;
double rewindLastTime_ = 0.0f;
};
static bool needsProcess = false;

2
UI/GameSettingsScreen.cpp
View File

@ -1054,7 +1054,7 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) {
return UI::EVENT_CONTINUE;
});
lockedMhz->SetZeroLabel(sy->T("Auto"));
PopupSliderChoice *rewindInterval = systemSettings->Add(new PopupSliderChoice(&g_Config.iRewindSnapshotInterval, 0, 30, sy->T("Rewind Snapshot Interval"), screenManager(), sy->T("seconds, 0:off")));
PopupSliderChoice *rewindInterval = systemSettings->Add(new PopupSliderChoice(&g_Config.iRewindSnapshotInterval, 0, 60, sy->T("Rewind Snapshot Interval"), screenManager(), sy->T("seconds, 0:off")));
rewindInterval->SetZeroLabel(sy->T("Off"));
systemSettings->Add(new ItemHeader(sy->T("General")));