diff --git a/Ryujinx.HLE/HOS/Horizon.cs b/Ryujinx.HLE/HOS/Horizon.cs index 1e218c87d7..79e9550696 100644 --- a/Ryujinx.HLE/HOS/Horizon.cs +++ b/Ryujinx.HLE/HOS/Horizon.cs @@ -105,8 +105,6 @@ namespace Ryujinx.HLE.HOS public Nacp ControlData { get; set; } - public string CurrentTitle { get; private set; } - public string TitleName { get; private set; } public string TitleID { get; private set; } @@ -366,7 +364,7 @@ namespace Ryujinx.HLE.HOS { ControlData = new Nacp(controlFile.AsStream()); - TitleName = CurrentTitle = ControlData.Descriptions[(int) State.DesiredTitleLanguage].Title; + TitleName = ControlData.Descriptions[(int)State.DesiredTitleLanguage].Title; } } @@ -500,12 +498,12 @@ namespace Ryujinx.HLE.HOS Nacp controlData = new Nacp(controlFile.AsStream()); - TitleName = CurrentTitle = controlData.Descriptions[(int)State.DesiredTitleLanguage].Title; + TitleName = controlData.Descriptions[(int)State.DesiredTitleLanguage].Title; TitleID = metaData.Aci0.TitleId.ToString("x16"); - if (string.IsNullOrWhiteSpace(CurrentTitle)) + if (string.IsNullOrWhiteSpace(TitleName)) { - TitleName = CurrentTitle = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Title)).Title; + TitleName = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Title)).Title; } return controlData; @@ -517,7 +515,7 @@ namespace Ryujinx.HLE.HOS } else { - TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16"); + TitleID = metaData.Aci0.TitleId.ToString("x16"); } } @@ -557,7 +555,7 @@ namespace Ryujinx.HLE.HOS } } - TitleID = CurrentTitle = metaData.Aci0.TitleId.ToString("x16"); + TitleID = metaData.Aci0.TitleId.ToString("x16"); LoadNso("rtld"); LoadNso("main"); @@ -659,7 +657,7 @@ namespace Ryujinx.HLE.HOS ContentManager.LoadEntries(); - TitleName = CurrentTitle = metaData.TitleName; + TitleName = metaData.TitleName; TitleID = metaData.Aci0.TitleId.ToString("x16"); ProgramLoader.LoadStaticObjects(this, metaData, new IExecutable[] { staticObject }); diff --git a/Ryujinx/Ui/GLScreen.cs b/Ryujinx/Ui/GLScreen.cs index 7c39463009..c5ad1d5959 100644 --- a/Ryujinx/Ui/GLScreen.cs +++ b/Ryujinx/Ui/GLScreen.cs @@ -297,10 +297,13 @@ namespace Ryujinx.UI double hostFps = _device.Statistics.GetSystemFrameRate(); double gameFps = _device.Statistics.GetGameFrameRate(); - string titleSection = string.IsNullOrWhiteSpace(_device.System.CurrentTitle) ? string.Empty - : " | " + _device.System.CurrentTitle; + string titleNameSection = string.IsNullOrWhiteSpace(_device.System.TitleName) ? string.Empty + : " | " + _device.System.TitleName; - _newTitle = $"Ryujinx{titleSection} | Host FPS: {hostFps:0.0} | Game FPS: {gameFps:0.0} | " + + string titleIDSection = string.IsNullOrWhiteSpace(_device.System.TitleID) ? string.Empty + : " | " + _device.System.TitleID.ToUpper(); + + _newTitle = $"Ryujinx{titleNameSection}{titleIDSection} | Host FPS: {hostFps:0.0} | Game FPS: {gameFps:0.0} | " + $"Game Vsync: {(_device.EnableDeviceVsync ? "On" : "Off")}"; _titleEvent = true;