Fix update-checker logic

Jameak · Mar 18, 2017 · 6754953 · 6754953
1 parent 8248f81
commit 6754953
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 * Added layer management window
 * Improved the layer adding window. Local files can now be dropped into the textbox, and it is clearer that a layer mask can be left out.
 * Added automatic mask generation to the layer adding window. Borders with transparency can have a mask generated for non-enclosed transparent areas.
+* Fix update checker logic.
 * Minor UI fixes.
 
 ## 1.0.1 - 2017-03-13

diff --git a/src/Stamper.DataAccess/UpdateChecker.cs b/src/Stamper.DataAccess/UpdateChecker.cs
@@ -47,18 +47,29 @@ public static async Task<Tuple<bool, string>> CheckForUpdate(bool forceCheck)
             {
                 var val = await result.Content.ReadAsStringAsync();
                 var response = JsonConvert.DeserializeObject<List<GithubRelease>>(val);
-
-
+
                 var currentVersion = ParseVersion(Properties.Settings.Default.Version);
                 foreach (var githubRelease in response)
                 {
                     if (!githubRelease.Draft && !githubRelease.Prerelease)
                     {
                         var releaseVersion = ParseVersion(githubRelease.Tag_name);
+
+                        if (currentVersion.Item1 < releaseVersion.Item1)
+                        {
+                            return new Tuple<bool, string>(true, githubRelease.Tag_name);
+                        }
 
-                        if (currentVersion.Item1 < releaseVersion.Item1) return new Tuple<bool, string>(true, githubRelease.Tag_name);
-                        if (currentVersion.Item2 < releaseVersion.Item2) return new Tuple<bool, string>(true, githubRelease.Tag_name);
-                        if (currentVersion.Item3 < releaseVersion.Item3) return new Tuple<bool, string>(true, githubRelease.Tag_name);
+                        if (currentVersion.Item1 == releaseVersion.Item1 && currentVersion.Item2 < releaseVersion.Item2)
+                        {
+                            return new Tuple<bool, string>(true, githubRelease.Tag_name);
+                        }
+
+                        if (currentVersion.Item1 == releaseVersion.Item1 && currentVersion.Item2 == releaseVersion.Item2 &&
+                            currentVersion.Item3 < releaseVersion.Item3)
+                        {
+                            return new Tuple<bool, string>(true, githubRelease.Tag_name);
+                        }
                     }
                 }
             }