From f94e28335c6fd37abb5aaa2c712af6cba48a902b Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Thu, 21 Nov 2024 21:31:39 +0000 Subject: [PATCH] Changed old log filename extension from `.txt.old.txt` to just `.old.txt` --- .../java/org/citra/citra_emu/fragments/HomeSettingsFragment.kt | 2 +- src/common/logging/backend.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/org/citra/citra_emu/fragments/HomeSettingsFragment.kt index 8ecd472da..97728844f 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/HomeSettingsFragment.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/HomeSettingsFragment.kt @@ -246,7 +246,7 @@ class HomeSettingsFragment : Fragment() { PermissionsHandler.citraDirectory )?.findFile("log") val currentLog = logDirectory?.findFile("citra_log.txt") - val oldLog = logDirectory?.findFile("citra_log.txt.old.txt") + val oldLog = logDirectory?.findFile("citra_log.old.txt") val intent = Intent().apply { action = Intent.ACTION_SEND diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 1a911fd75..5be0980ec 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include +#include #include #include @@ -90,7 +91,7 @@ class FileBackend final : public Backend { public: explicit FileBackend(const std::string& filename) { auto old_filename = filename; - old_filename += ".old.txt"; + boost::replace_all(old_filename, ".txt", ".old.txt"); // Existence checks are done within the functions themselves. // We don't particularly care if these succeed or not.