Skip to content

Fix iso path checks #19360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elad335 merged 1 commit into from
Aug 30, 2026
Merged

Fix iso path checks #19360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions rpcs3/main_application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,24 +397,19 @@ EmuCallbacks main_application::CreateCallbacks()
fi.setFile(fi.path());
}

const QString result = QDir(fi.canonicalFilePath()).filePath(tail);
QString result = QDir::cleanPath(QDir(fi.canonicalFilePath()).filePath(tail));

#ifdef _WIN32
std::string result_with_drive = QDir::cleanPath(result).toStdString();

if (!tail.isEmpty() && sv.starts_with("/") && !sv.starts_with("//"))
if (sv.starts_with("/") && !sv.starts_with("//"))
{
// Erase absolute path for non-existant path
if (result_with_drive.size() > 1 && result_with_drive[1] == ':')
if (result.size() >= 3 && result[1] == ':' && result[2] == '/')
{
result_with_drive.erase(result_with_drive.begin(), result_with_drive.begin() + 2);
result.remove(0, 2);
}
}

return result_with_drive;
#else
return QDir::cleanPath(result).toStdString();
#endif
return result.toStdString();
};

callbacks.get_font_dirs = []()
Expand Down
Loading