archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-02 13:01:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

MSVC: Fix weird std::move on const variable warning...

Browse source
This commit is contained in:
Megamouse 2025-05-07 20:20:52 +02:00
parent fc3a905c90
commit 0146b845d9
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/rpcs3.cpp
View file

@ -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);