Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14690 from MaverickAmon02/dtm-use-after-move

Browse Source 
State: Fix Use After Move In LoadAsFromCore
This commit is contained in:
Jordan Woyak authored and GitHub committed 2026-06-20 11:40:17 -05:00
2 parents 43210d1430 5797b943b2
commit a426df4823
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Core/State.cpp
+4 -4
View File
@@ -15,6 +15,7 @@
#include <fmt/chrono.h> #include <fmt/chrono.h>
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/std.h>
#include <lz4.h> #include <lz4.h>
#include <lzo/lzo1x.h> #include <lzo/lzo1x.h>
@@ -463,7 +464,7 @@ static void CompressAndDumpState(Core::System& system, const CompressAndDumpStat
else else
{ {
const std::filesystem::path temp_path(filename); 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) if (loaded_successfully)
{ {
std::filesystem::path temp_filename(std::move(filename)); const std::filesystem::path temp_filename(filename);
Core::DisplayMessage(fmt::format("Loaded State from {}", temp_filename.filename().string()), Core::DisplayMessage(fmt::format("Loaded State from {}", temp_filename.filename()), 2000);
2000);
if (File::Exists(filename + ".dtm")) if (File::Exists(filename + ".dtm"))
{ {
movie.LoadInput(filename + ".dtm"); movie.LoadInput(filename + ".dtm");