archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 14:31:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't improperly resolve symlinks when booting games.

Browse source
This commit is contained in:
Stephen McKinney 2020-02-15 08:33:14 -06:00 • committed by Ivan
parent 00b74fb951
commit 2b853cc8bc
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/main.cpp
View file

@ -306,7 +306,7 @@ int main(int argc, char** argv)
} }
// Ugly workaround // Ugly workaround
QTimer::singleShot(2, [path = sstr(QFileInfo(args.at(0)).canonicalFilePath()), argv = std::move(argv)]() mutable QTimer::singleShot(2, [path = sstr(QFileInfo(args.at(0)).absoluteFilePath()), argv = std::move(argv)]() mutable
{ {
Emu.argv = std::move(argv); Emu.argv = std::move(argv);
Emu.SetForceBoot(true); Emu.SetForceBoot(true);

6
rpcs3/rpcs3qt/main_window.cpp
View file

@ -340,7 +340,7 @@ void main_window::BootElf()
// game folder in case of having e.g. a Game Folder with collected links to elf files. // game folder in case of having e.g. a Game Folder with collected links to elf files.
// Don't set last path earlier in case of cancelled dialog // Don't set last path earlier in case of cancelled dialog
guiSettings->SetValue(gui::fd_boot_elf, filePath); guiSettings->SetValue(gui::fd_boot_elf, filePath);
const std::string path = sstr(QFileInfo(filePath).canonicalFilePath()); const std::string path = sstr(QFileInfo(filePath).absoluteFilePath());
gui_log.notice("Booting from BootElf..."); gui_log.notice("Booting from BootElf...");
Boot(path, "", true); Boot(path, "", true);
@ -357,7 +357,7 @@ void main_window::BootGame()
} }
QString path_last_Game = guiSettings->GetValue(gui::fd_boot_game).toString(); QString path_last_Game = guiSettings->GetValue(gui::fd_boot_game).toString();
QString dirPath = QFileDialog::getExistingDirectory(this, tr("Select Game Folder"), path_last_Game, QFileDialog::ShowDirsOnly); QString dirPath = QFileDialog::getExistingDirectory(this, tr("Select Game Folder"), path_last_Game, QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
if (dirPath == NULL) if (dirPath == NULL)
{ {
@ -1287,7 +1287,7 @@ void main_window::CreateConnects()
QStringList paths; QStringList paths;
// Only select one folder for now // Only select one folder for now
paths << QFileDialog::getExistingDirectory(this, tr("Select a folder containing one or more games"), qstr(fs::get_config_dir()), QFileDialog::ShowDirsOnly); paths << QFileDialog::getExistingDirectory(this, tr("Select a folder containing one or more games"), qstr(fs::get_config_dir()), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
if (!paths.isEmpty()) if (!paths.isEmpty())
{ {

2
rpcs3/rpcs3qt/vfs_dialog_tab.cpp
View file

@ -94,7 +94,7 @@ void vfs_dialog_tab::Reset()
void vfs_dialog_tab::AddNewDirectory() void vfs_dialog_tab::AddNewDirectory()
{ {
QString dir = QFileDialog::getExistingDirectory(nullptr, tr("Choose a directory"), QCoreApplication::applicationDirPath()); QString dir = QFileDialog::getExistingDirectory(nullptr, tr("Choose a directory"), QCoreApplication::applicationDirPath(), QFileDialog::DontResolveSymlinks);
if (dir.isEmpty()) if (dir.isEmpty())
return; return;