From 87620f9ed504541be1c787ec767c1cf9dfed74fc Mon Sep 17 00:00:00 2001 From: Ashley Date: Thu, 6 Feb 2020 15:10:59 -0500 Subject: [PATCH] I am the big smart --- Ryujinx/Ui/AboutWindow.cs | 11 ++++++++++- Ryujinx/Updater/UpdateParser.cs | 9 ++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Ryujinx/Ui/AboutWindow.cs b/Ryujinx/Ui/AboutWindow.cs index 906d28fd58..516c5f698d 100644 --- a/Ryujinx/Ui/AboutWindow.cs +++ b/Ryujinx/Ui/AboutWindow.cs @@ -45,7 +45,16 @@ namespace Ryujinx.Ui try { - _versionText.Text = "Version " + File.ReadAllText(versionJsonFile); + string currentVersionJson; + string currentVersionBranch; + string currentVersionPr; + var VersionJSON = JObject.Parse(Path.Combine(Environment.CurrentDirectory, "Version.json")); + var _JRoot = VersionJSON[0]; + currentVersionJson = (string)_JRoot["BuildVer"]; + currentVersionPr = (string)_JRoot["BuildPR"]; + currentVersionBranch = (string)_JRoot["BuildBranch"]; + + _versionText.Text = "Version " + File.ReadAllText(currentVersionJson + " - Branch " + currentVersionBranch + " - PR ID " + currentVersionPr); } catch { diff --git a/Ryujinx/Updater/UpdateParser.cs b/Ryujinx/Updater/UpdateParser.cs index d1bd41bbc4..e6baf1f354 100644 --- a/Ryujinx/Updater/UpdateParser.cs +++ b/Ryujinx/Updater/UpdateParser.cs @@ -70,11 +70,14 @@ namespace Ryujinx { try { + string currentVersionJson; + string currentVersionBranch; + string currentVersionPr; var VersionJSON = JObject.Parse(Path.Combine(Environment.CurrentDirectory, "Version.json")); var _JRoot = VersionJSON[0]; - (string)currentVersionJson = (string)_JRoot["BuildVer"]; - (string)currentVersionPr = (string)_JRoot["BuildPR"]; - (string)currentVersionBranch = (string)_JRoot["BuildBranch"]; + currentVersionJson = (string)_JRoot["BuildVer"]; + currentVersionPr = (string)_JRoot["BuildPR"]; + currentVersionBranch = (string)_JRoot["BuildBranch"]; Version newVersion = Version.Parse(_buildVer); Version currentVersion = Version.Parse(currentVersionJson);