preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-22 10:49:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

SaveState: Report a state that fails to load as being from another version

Browse Source 
When the file reads fine but a section doesn't, that's almost always a
state from another version, so say that (LoadStateWrongVersion), with the
version that saved it and the failing section on the second line.

LoadPtr() now returns just the section title, for callers to phrase.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-10-19 17:50:48 +02:00
1 parent 79c2b9b0fd
commit b75f487dc5
3 files changed
+12 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/SaveState.cpp
+8 -5
View File
@@ -974,9 +974,12 @@ int g_screenshotFailures;
g_lastSaveTime = time_now_d();
} else if (result == CChunkFileReader::ERROR_BROKEN_STATE) {
HandleLoadFailure(false, &callbackMetadata);
callbackMessage = std::string(i18nLoadFailure) + ": " + errorString;
callbackMetadata = SavedByVersion(op.path);
ERROR_LOG(Log::SaveState, "Load state failure: %s (saved by %s)", errorString.c_str(), callbackMetadata.c_str());
// The file was fine, its contents weren't: almost always a state from another version.
// errorString is the section that failed.
callbackMessage = sc->T("LoadStateWrongVersion", i18nLoadFailure);
const std::string version = SavedByVersion(op.path);
callbackMetadata = version.empty() ? "(" + errorString + ")" : version + " (" + errorString + ")";
ERROR_LOG(Log::SaveState, "Load state failure at %s (saved by %s)", errorString.c_str(), version.c_str());
callbackResult = Status::FAILURE;
} else {
callbackMessage = errorString.empty() ? std::string(i18nLoadFailure) : std::string(sc->T(errorString, i18nLoadFailure));
@@ -1052,11 +1055,11 @@ int g_screenshotFailures;
hasLoadedState = true;
Core_ResetException();
} else {
callbackMessage = std::string(i18nLoadFailure) + ": " + errorString;
callbackMessage = std::string(i18nLoadFailure) + " (" + errorString + ")";
callbackResult = Status::FAILURE;
}
} else {
callbackMessage = std::string(i18nLoadFailure) + ": " + errorString;
callbackMessage = i18nLoadFailure;
callbackResult = Status::FAILURE;
}
break;