From 1fafb7ad2522eaf336c6a886ee6c55721de8706c Mon Sep 17 00:00:00 2001
From: Alex Barney <thealexbarney@gmail.com>
Date: Sat, 2 Nov 2019 14:45:20 -0700
Subject: [PATCH] Load control NCA when loading from an NSP

---
 Ryujinx.HLE/HOS/Horizon.cs | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs
index 5bb45d2ccd..6bd58c583b 100644
--- a/Ryujinx.HLE/HOS/Horizon.cs
+++ b/Ryujinx.HLE/HOS/Horizon.cs
@@ -500,29 +500,10 @@ namespace Ryujinx.HLE.HOS
             }
 
             LoadExeFs(codeFs, out Npdm metaData);
-
-            Nacp ReadControlData()
-            {
-                IFileSystem controlRomfs = controlNca.OpenFileSystem(NcaSectionType.Data, FsIntegrityCheckLevel);
-
-                controlRomfs.OpenFile(out IFile controlFile, "/control.nacp", OpenMode.Read).ThrowIfFailure();
-
-                Nacp controlData = new Nacp(controlFile.AsStream());
-
-                TitleName = CurrentTitle = controlData.Descriptions[(int)State.DesiredTitleLanguage].Title;
-                TitleID   = metaData.Aci0.TitleId.ToString("x16");
-
-                if (string.IsNullOrWhiteSpace(CurrentTitle))
-                {
-                    TitleName = CurrentTitle = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Title)).Title;
-                }
-
-                return controlData;
-            }
-
+            
             if (controlNca != null)
             {
-                ReadControlData();
+                ReadControlData(controlNca);
             }
             else
             {