Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Crashfix in folder move logging. Plus relax an assert

Browse Source
This commit is contained in:
Henrik Rydgård committed 2025-06-01 10:55:21 +02:00
1 parent 6ff1dff99f
commit ab2f85b6b8
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/Util/MemStick.cpp
+4 -4
View File
@@ -161,7 +161,7 @@ MoveResult *MoveDirectoryContentsSafe(Path moveSrc, Path moveDest, MoveProgressR
// We loop through the files/dirs in the source directory and just try to move them, it should work.
if (MoveChildrenFast(moveSrc, moveDest, progressReporter)) {
INFO_LOG(Log::System, "Quick-move succeeded after %0.1f ms", moveStart.ElapsedMs());
progressReporter.SetProgress(StringFromFormat("%s (%0.3s)", ms->T_cstr("Done!"), moveStart.ElapsedSeconds()));
progressReporter.SetProgress(StringFromFormat("%s (%0.3f)", ms->T_cstr("Done!"), moveStart.ElapsedSeconds()));
return new MoveResult{ true, "" };
} else {
INFO_LOG(Log::System, "Quick move denied after %0.1f ms, falling back to slow move.", moveStart.ElapsedMs());
@@ -178,9 +178,9 @@ MoveResult *MoveDirectoryContentsSafe(Path moveSrc, Path moveDest, MoveProgressR
// NOTE: It's correct to pass moveSrc twice here, it's to keep the root in the recursion.
if (!ListFileSuffixesRecursively(moveSrc, moveSrc, directorySuffixesToCreate, fileSuffixesToMove, progressReporter)) {
// TODO: Handle failure listing files.
std::string error = "Failed to read old directory";
INFO_LOG(Log::System, "%s", error.c_str());
progressReporter.SetProgress(ms->T(error.c_str()));
const char *error = "Failed to read old directory";
INFO_LOG(Log::System, "%s", error);
progressReporter.SetProgress(ms->T(error));
return new MoveResult{ false, error };
}
GPU/Common/PresentationCommon.cpp
+1 -1
View File
@@ -526,7 +526,7 @@ Draw::Pipeline *PresentationCommon::CreatePipeline(std::vector<Draw::ShaderModul
void PresentationCommon::CreateDeviceObjects() {
using namespace Draw;
_assert_(vdata_ == nullptr);
_dbg_assert_(vdata_ == nullptr);
// TODO: Could probably just switch to DrawUP, it's supported well by all backends now.
vdata_ = draw_->CreateBuffer(sizeof(Vertex) * 12, BufferUsageFlag::DYNAMIC | BufferUsageFlag::VERTEXDATA);