Explorar o código

Merge pull request #1403 from DarkLordZach/install-sysnand

qt: Install System TitleTypes to System NAND
bunnei %!s(int64=7) %!d(string=hai) anos
pai
achega
decc319634
Modificáronse 1 ficheiros con 14 adicións e 4 borrados
  1. 14 4
      src/yuzu/main.cpp

+ 14 - 4
src/yuzu/main.cpp

@@ -1055,11 +1055,21 @@ void GMainWindow::OnMenuInstallToNAND() {
             return;
         }
 
-        if (index >= 5)
-            index += 0x7B;
+        // If index is equal to or past Game, add the jump in TitleType.
+        if (index >= 5) {
+            index += static_cast<size_t>(FileSys::TitleType::Application) -
+                     static_cast<size_t>(FileSys::TitleType::FirmwarePackageB);
+        }
+
+        FileSys::InstallResult res;
+        if (index >= static_cast<size_t>(FileSys::TitleType::Application)) {
+            res = Service::FileSystem::GetUserNANDContents()->InstallEntry(
+                nca, static_cast<FileSys::TitleType>(index), false, qt_raw_copy);
+        } else {
+            res = Service::FileSystem::GetSystemNANDContents()->InstallEntry(
+                nca, static_cast<FileSys::TitleType>(index), false, qt_raw_copy);
+        }
 
-        const auto res = Service::FileSystem::GetUserNANDContents()->InstallEntry(
-            nca, static_cast<FileSys::TitleType>(index), false, qt_raw_copy);
         if (res == FileSys::InstallResult::Success) {
             success();
         } else if (res == FileSys::InstallResult::ErrorAlreadyExists) {