summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/android/app/src/main/jni/native.cpp4
-rw-r--r--src/yuzu/main.cpp11
-rw-r--r--src/yuzu/main.h2
3 files changed, 5 insertions, 12 deletions
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 9fa082dd5..9cf71680c 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -141,10 +141,6 @@ public:
141 if (nsp->IsExtractedType()) { 141 if (nsp->IsExtractedType()) {
142 return InstallError; 142 return InstallError;
143 } 143 }
144 } else if (file_extension == "xci") {
145 jconst xci =
146 std::make_shared<FileSys::XCI>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
147 nsp = xci->GetSecurePartitionNSP();
148 } else { 144 } else {
149 return ErrorFilenameExtension; 145 return ErrorFilenameExtension;
150 } 146 }
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() {
3113 QFuture<InstallResult> future; 3113 QFuture<InstallResult> future;
3114 InstallResult result; 3114 InstallResult result;
3115 3115
3116 if (file.endsWith(QStringLiteral("xci"), Qt::CaseInsensitive) || 3116 if (file.endsWith(QStringLiteral("nsp"), Qt::CaseInsensitive)) {
3117 file.endsWith(QStringLiteral("nsp"), Qt::CaseInsensitive)) {
3118 3117
3119 future = QtConcurrent::run([this, &file] { return InstallNSPXCI(file); }); 3118 future = QtConcurrent::run([this, &file] { return InstallNSP(file); });
3120 3119
3121 while (!future.isFinished()) { 3120 while (!future.isFinished()) {
3122 QCoreApplication::processEvents(); 3121 QCoreApplication::processEvents();
@@ -3175,7 +3174,7 @@ void GMainWindow::OnMenuInstallToNAND() {
3175 ui->action_Install_File_NAND->setEnabled(true); 3174 ui->action_Install_File_NAND->setEnabled(true);
3176} 3175}
3177 3176
3178InstallResult GMainWindow::InstallNSPXCI(const QString& filename) { 3177InstallResult GMainWindow::InstallNSP(const QString& filename) {
3179 const auto qt_raw_copy = [this](const FileSys::VirtualFile& src, 3178 const auto qt_raw_copy = [this](const FileSys::VirtualFile& src,
3180 const FileSys::VirtualFile& dest, std::size_t block_size) { 3179 const FileSys::VirtualFile& dest, std::size_t block_size) {
3181 if (src == nullptr || dest == nullptr) { 3180 if (src == nullptr || dest == nullptr) {
@@ -3209,9 +3208,7 @@ InstallResult GMainWindow::InstallNSPXCI(const QString& filename) {
3209 return InstallResult::Failure; 3208 return InstallResult::Failure;
3210 } 3209 }
3211 } else { 3210 } else {
3212 const auto xci = std::make_shared<FileSys::XCI>( 3211 return InstallResult::Failure;
3213 vfs->OpenFile(filename.toStdString(), FileSys::Mode::Read));
3214 nsp = xci->GetSecurePartitionNSP();
3215 } 3212 }
3216 3213
3217 if (nsp->GetStatus() != Loader::ResultStatus::Success) { 3214 if (nsp->GetStatus() != Loader::ResultStatus::Success) {
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 53bedfab3..ba318eb11 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -387,7 +387,7 @@ private:
387 void RemoveCacheStorage(u64 program_id); 387 void RemoveCacheStorage(u64 program_id);
388 bool SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id, 388 bool SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id,
389 u64* selected_title_id, u8* selected_content_record_type); 389 u64* selected_title_id, u8* selected_content_record_type);
390 InstallResult InstallNSPXCI(const QString& filename); 390 InstallResult InstallNSP(const QString& filename);
391 InstallResult InstallNCA(const QString& filename); 391 InstallResult InstallNCA(const QString& filename);
392 void MigrateConfigFiles(); 392 void MigrateConfigFiles();
393 void UpdateWindowTitle(std::string_view title_name = {}, std::string_view title_version = {}, 393 void UpdateWindowTitle(std::string_view title_name = {}, std::string_view title_version = {},