This commit is contained in:
PavelBARABANOV 2026-10-20 02:10:15 +03:00
parent 469aa1e3d6
commit 1928bbbde0
2 changed files with 10 additions and 5 deletions

View file

@ -76,7 +76,9 @@ jboolean Java_org_yuzu_yuzu_1emu_utils_GameMetadata_getIsValid(JNIEnv* env, jobj
auto const file_type = loader->GetFileType(); auto const file_type = loader->GetFileType();
if (file_type == Loader::FileType::Unknown || file_type == Loader::FileType::Error) if (file_type == Loader::FileType::Unknown || file_type == Loader::FileType::Error)
return false; return false;
if ((file_type == Loader::FileType::NSP || file_type == Loader::FileType::XCI) && !Loader::IsBootableGameContainer(file, file_type)) if ((file_type == Loader::FileType::NSP || file_type == Loader::FileType::XCI ||
file_type == Loader::FileType::NSZ || file_type == Loader::FileType::XCZ) &&
!Loader::IsBootableGameContainer(file, file_type))
return false; return false;
u64 program_id = 0; u64 program_id = 0;
return loader->ReadProgramId(program_id) == Loader::ResultStatus::Success; return loader->ReadProgramId(program_id) == Loader::ResultStatus::Success;

View file

@ -2797,9 +2797,9 @@ void MainWindow::IncrementInstallProgress() {
void MainWindow::OnMenuInstallToNAND() { void MainWindow::OnMenuInstallToNAND() {
const QString file_filter = const QString file_filter =
tr("Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive " tr("Installable Switch File (*.nca *.nsp *.nsz *.xci *.xcz);;Nintendo Content Archive "
"(*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge " "(*.nca);;Nintendo Submission Package (*.nsp *.nsz);;NX Cartridge "
"Image (*.xci)"); "Image (*.xci *.xcz)");
QStringList filenames = QFileDialog::getOpenFileNames( QStringList filenames = QFileDialog::getOpenFileNames(
this, tr("Install Files"), QString::fromStdString(UISettings::values.roms_path), this, tr("Install Files"), QString::fromStdString(UISettings::values.roms_path),
@ -2856,7 +2856,10 @@ void MainWindow::OnMenuInstallToNAND() {
QFuture<ContentManager::InstallResult> future; QFuture<ContentManager::InstallResult> future;
ContentManager::InstallResult result; ContentManager::InstallResult result;
if (file.endsWith(QStringLiteral("nsp"), Qt::CaseInsensitive)) { if (file.endsWith(QStringLiteral("nsp"), Qt::CaseInsensitive) ||
file.endsWith(QStringLiteral("nsz"), Qt::CaseInsensitive) ||
file.endsWith(QStringLiteral("xci"), Qt::CaseInsensitive) ||
file.endsWith(QStringLiteral("xcz"), Qt::CaseInsensitive)) {
const auto progress_callback = [this](size_t size, size_t progress) { const auto progress_callback = [this](size_t size, size_t progress) {
emit UpdateInstallProgress(); emit UpdateInstallProgress();
if (install_progress->wasCanceled()) { if (install_progress->wasCanceled()) {