summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2026-06-20 11:40:17 -0500
committerGitHub <noreply@github.com>2026-06-20 11:40:17 -0500
commita426df48234f0e59cb64684a35a389cda56087ce (patch)
tree87f31fad1c38257b294b4ac0393b71651d6504d0
parent43210d14309b2028cc045fae695c879ef26c9ce5 (diff)
parent5797b943b250bf3ec0dce258bb210ca9b1d57c28 (diff)
Merge pull request #14690 from MaverickAmon02/dtm-use-after-move
State: Fix Use After Move In LoadAsFromCore
-rw-r--r--Source/Core/Core/State.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp
index 5724240ffd..ddd52f1d56 100644
--- a/Source/Core/Core/State.cpp
+++ b/Source/Core/Core/State.cpp
@@ -15,6 +15,7 @@
#include <fmt/chrono.h>
#include <fmt/format.h>
+#include <fmt/std.h>
#include <lz4.h>
#include <lzo/lzo1x.h>
@@ -463,7 +464,7 @@ static void CompressAndDumpState(Core::System& system, const CompressAndDumpStat
else
{
const std::filesystem::path temp_path(filename);
- Core::DisplayMessage(fmt::format("Saved State to {}", temp_path.filename().string()), 2000);
+ Core::DisplayMessage(fmt::format("Saved State to {}", temp_path.filename()), 2000);
}
}
@@ -840,9 +841,8 @@ static void LoadAsFromCore(Core::System& system, std::string filename)
{
if (loaded_successfully)
{
- std::filesystem::path temp_filename(std::move(filename));
- Core::DisplayMessage(fmt::format("Loaded State from {}", temp_filename.filename().string()),
- 2000);
+ const std::filesystem::path temp_filename(filename);
+ Core::DisplayMessage(fmt::format("Loaded State from {}", temp_filename.filename()), 2000);
if (File::Exists(filename + ".dtm"))
{
movie.LoadInput(filename + ".dtm");