From f550f8f5a54f5b3b8db3851ba48db6840f00cf73 Mon Sep 17 00:00:00 2001 From: Keith Stellyes Date: Sun, 25 Oct 2020 01:35:42 -0700 Subject: [PATCH] Fix #13282: Autosaves are not deleted when limit is reached --- src/openrct2/Game.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index d6023d21b2..e6a4302914 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -723,7 +723,7 @@ static void limit_autosave_count(const size_t numberOfFilesToKeep, bool processL autosaveFiles[i].resize(MAX_PATH, 0); if (scanner->Next()) { - platform_get_user_directory(autosaveFiles[i].data(), folderDirectory.c_str(), sizeof(utf8) * MAX_PATH); + safe_strcpy(autosaveFiles[i].data(), folderDirectory.c_str(), sizeof(utf8) * MAX_PATH); safe_strcat_path(autosaveFiles[i].data(), "autosave", sizeof(utf8) * MAX_PATH); safe_strcat_path(autosaveFiles[i].data(), scanner->GetPathRelative(), sizeof(utf8) * MAX_PATH); } @@ -739,7 +739,10 @@ static void limit_autosave_count(const size_t numberOfFilesToKeep, bool processL for (size_t i = 0; numAutosavesToDelete > 0; i++, numAutosavesToDelete--) { - platform_file_delete(autosaveFiles[i].data()); + if (!platform_file_delete(autosaveFiles[i].data())) + { + log_warning("Failed to delete autosave file: %s", autosaveFiles[i].data()); + } } }