VERY experimental Nintendo Switch 2 emulator
C++
Qt: Remove ability to install xci files
Charles Lombardoe980ec6f2429
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cppindex b1b6b9354c..adb7b332f9 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) {diff --git a/src/yuzu/main.h b/src/yuzu/main.hindex 53bedfab35..ba318eb11e 100644--- a/src/yuzu/main.h+++ b/src/yuzu/main.h@@ -387,7 +387,7 @@ private:void RemoveCacheStorage(u64 program_id);bool SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id,u64* selected_title_id, u8* selected_content_record_type);- InstallResult InstallNSPXCI(const QString& filename);+ InstallResult InstallNSP(const QString& filename);InstallResult InstallNCA(const QString& filename);void MigrateConfigFiles();void UpdateWindowTitle(std::string_view title_name = {}, std::string_view title_version = {},