diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-09-28 09:35:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-28 09:35:16 -0400 |
| commit | 4487c165c835803984871aa8d78605976a113c7e (patch) | |
| tree | a21b212a42f261e2a169a1678b3c14bbf52bff54 /src/yuzu/main.cpp | |
| parent | f7821041257540c61813487537603ea190a2a435 (diff) | |
| parent | feebdc9779f7934f6e6dcafd8e371db720b58215 (diff) | |
Merge pull request #11604 from t895/only-install-nsp
Frontend: Remove ability to install xci files
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index b1b6b9354..adb7b332f 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -3113,10 +3113,9 @@ void GMainWindow::OnMenuInstallToNAND() { QFuture<InstallResult> future; InstallResult result; - if (file.endsWith(QStringLiteral("xci"), Qt::CaseInsensitive) || - file.endsWith(QStringLiteral("nsp"), Qt::CaseInsensitive)) { + if (file.endsWith(QStringLiteral("nsp"), Qt::CaseInsensitive)) { - future = QtConcurrent::run([this, &file] { return InstallNSPXCI(file); }); + future = QtConcurrent::run([this, &file] { return InstallNSP(file); }); while (!future.isFinished()) { QCoreApplication::processEvents(); @@ -3175,7 +3174,7 @@ void GMainWindow::OnMenuInstallToNAND() { ui->action_Install_File_NAND->setEnabled(true); } -InstallResult GMainWindow::InstallNSPXCI(const QString& filename) { +InstallResult GMainWindow::InstallNSP(const QString& filename) { const auto qt_raw_copy = [this](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest, std::size_t block_size) { if (src == nullptr || dest == nullptr) { @@ -3209,9 +3208,7 @@ InstallResult GMainWindow::InstallNSPXCI(const QString& filename) { return InstallResult::Failure; } } else { - const auto xci = std::make_shared<FileSys::XCI>( - vfs->OpenFile(filename.toStdString(), FileSys::Mode::Read)); - nsp = xci->GetSecurePartitionNSP(); + return InstallResult::Failure; } if (nsp->GetStatus() != Loader::ResultStatus::Success) { |