From 58adf0c3c1efcb150a68d171fe2720a0f0b0bcd6 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 7 May 2025 20:20:52 +0200 Subject: [PATCH] MSVC: Fix weird std::move on const variable warning... --- rpcs3/rpcs3.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rpcs3/rpcs3.cpp b/rpcs3/rpcs3.cpp index 1942de378d..f7efb7728b 100644 --- a/rpcs3/rpcs3.cpp +++ b/rpcs3/rpcs3.cpp @@ -1192,7 +1192,7 @@ int run_rpcs3(int argc, char** argv) } else if (const QStringList args = parser.positionalArguments(); (!args.isEmpty() || !emu_argv.empty()) && !is_updating && !parser.isSet(arg_installfw) && !parser.isSet(arg_installpkg)) { - const std::string spath = (args.isEmpty() ? emu_argv[0] : ::at32(args, 0).toStdString()); + std::string spath = (args.isEmpty() ? emu_argv[0] : ::at32(args, 0).toStdString()); if (spath.starts_with(Emulator::vfs_boot_prefix)) { @@ -1275,8 +1275,13 @@ int run_rpcs3(int argc, char** argv) } } + if (!spath.starts_with("%RPCS3_")) + { + spath = QFileInfo(::at32(args, 0)).absoluteFilePath().toStdString(); + } + // Postpone startup to main event loop - Emu.CallFromMainThread([path = spath.starts_with("%RPCS3_") ? spath : QFileInfo(::at32(args, 0)).absoluteFilePath().toStdString(), rpcs3_argv = std::move(rpcs3_argv), config_path = std::move(config_path)]() mutable + Emu.CallFromMainThread([path = std::move(spath), rpcs3_argv = std::move(rpcs3_argv), config_path = std::move(config_path)]() mutable { Emu.argv = std::move(rpcs3_argv); Emu.SetForceBoot(true);