From 6210384d66b09e458d2b11da24e630d26dd311c7 Mon Sep 17 00:00:00 2001 From: Ash Date: Thu, 6 Feb 2020 16:01:04 -0500 Subject: [PATCH 1/3] Auto stash before merge of "master" and "origin/master" --- Ryujinx/Ui/AboutWindow.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Ryujinx/Ui/AboutWindow.cs b/Ryujinx/Ui/AboutWindow.cs index bde1593d69..bb02a82648 100644 --- a/Ryujinx/Ui/AboutWindow.cs +++ b/Ryujinx/Ui/AboutWindow.cs @@ -49,6 +49,14 @@ namespace Ryujinx.Ui string currentVersionJson; string currentVersionBranch; string currentVersionPr; +<<<<<<< Updated upstream +======= + var VersionJSON = JObject.Parse(File.ReadAllText(System.IO.Path.Combine(Environment.CurrentDirectory, "Version.json"))); + var _JRoot = VersionJSON[""]; + currentVersionJson = (string)_JRoot["BuildVer"]; + currentVersionPr = (string)_JRoot["BuildPR"]; + currentVersionBranch = (string)_JRoot["BuildBranch"]; +>>>>>>> Stashed changes JObject VersionJSON = JObject.Parse(File.ReadAllText(System.IO.Path.Combine(Environment.CurrentDirectory, "Version.json"))); From b7333014e666a08bf8d903dcabca812ba1339c02 Mon Sep 17 00:00:00 2001 From: Ash Date: Thu, 6 Feb 2020 16:04:19 -0500 Subject: [PATCH 2/3] Fixed --- Ryujinx/Ui/AboutWindow.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Ryujinx/Ui/AboutWindow.cs b/Ryujinx/Ui/AboutWindow.cs index bb02a82648..cfe12be5eb 100644 --- a/Ryujinx/Ui/AboutWindow.cs +++ b/Ryujinx/Ui/AboutWindow.cs @@ -49,14 +49,11 @@ namespace Ryujinx.Ui string currentVersionJson; string currentVersionBranch; string currentVersionPr; -<<<<<<< Updated upstream -======= var VersionJSON = JObject.Parse(File.ReadAllText(System.IO.Path.Combine(Environment.CurrentDirectory, "Version.json"))); var _JRoot = VersionJSON[""]; currentVersionJson = (string)_JRoot["BuildVer"]; currentVersionPr = (string)_JRoot["BuildPR"]; currentVersionBranch = (string)_JRoot["BuildBranch"]; ->>>>>>> Stashed changes JObject VersionJSON = JObject.Parse(File.ReadAllText(System.IO.Path.Combine(Environment.CurrentDirectory, "Version.json"))); From f624218a9a11628d08b2e49a1745e683ad399067 Mon Sep 17 00:00:00 2001 From: Ash Date: Thu, 6 Feb 2020 16:12:55 -0500 Subject: [PATCH 3/3] Much comparison --- Ryujinx/Updater/UpdateParser.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ryujinx/Updater/UpdateParser.cs b/Ryujinx/Updater/UpdateParser.cs index e6baf1f354..a27446b349 100644 --- a/Ryujinx/Updater/UpdateParser.cs +++ b/Ryujinx/Updater/UpdateParser.cs @@ -82,7 +82,7 @@ namespace Ryujinx Version newVersion = Version.Parse(_buildVer); Version currentVersion = Version.Parse(currentVersionJson); - if (newVersion.CompareTo(currentVersion) == 0) + if (newVersion.CompareTo(currentVersion) > 0) { GtkDialog.CreateInfoDialog("Update", "Ryujinx - Updater", "You are already using the most updated version of Ryujinx!", "");