From 3a99348644561368071b5517579a3a9786ad2c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Fri, 25 Apr 2025 21:30:31 +0200 Subject: [PATCH] Fixed: nightly version asked for update to stable --- CHANGELOG.md | 1 + src/com/jpexs/decompiler/flash/gui/Main.java | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85c6e55fa..d69bf3a7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ All notable changes to this project will be documented in this file. - [#2415] AS3 direct editation - nested functions - prefer callstack variables over prototype chain - AS3 - AIR float support - incorrect writing float values to output stream - AS3 - AIR float support - ABC Explorer incorrectly calculating float usages (For clean action, etc.) +- nightly version asked for update to stable ## [22.0.2] - 2025-01-17 ### Added diff --git a/src/com/jpexs/decompiler/flash/gui/Main.java b/src/com/jpexs/decompiler/flash/gui/Main.java index 37be5a478..b94b4b6d4 100644 --- a/src/com/jpexs/decompiler/flash/gui/Main.java +++ b/src/com/jpexs/decompiler/flash/gui/Main.java @@ -3353,8 +3353,8 @@ public class Main { public static boolean checkForUpdates() { String currentVersion = ApplicationInfo.version; - if (currentVersion.equals("unknown")) { - // sometimes during development the version information is not available + if (currentVersion.equals("unknown") || currentVersion.equals("0.0.0")) { + // during development the version information is not available return false; } @@ -3364,14 +3364,17 @@ public class Main { if (!showStable && !showNightly) { return false; } - + + String stableTagName = "version" + ApplicationInfo.version_major + "." + ApplicationInfo.version_minor + "." + ApplicationInfo.version_release; + String ignoreVersion = "-"; + String currentTagName; if (ApplicationInfo.nightly) { currentTagName = "nightly" + ApplicationInfo.version_build; } else { - currentTagName = "version" + ApplicationInfo.version_major + "." + ApplicationInfo.version_minor + "." + ApplicationInfo.version_release; + currentTagName = stableTagName; } - + if (!showNightly) { //prereleases are not shown as latest, when checking latest nightly, this is useless JsonValue latestVersionInfoJson = urlGetJson(ApplicationInfo.GITHUB_RELEASES_LATEST_URL); @@ -3379,7 +3382,7 @@ public class Main { return false; } String latestTagName = latestVersionInfoJson.asObject().get("tag_name").asString(); - if (currentTagName.equals(latestTagName)) { + if (currentTagName.equals(latestTagName) || stableTagName.equals(latestTagName)) { //no new version return false; } @@ -3394,7 +3397,7 @@ public class Main { for (int i = 0; i < arr.size(); i++) { JsonObject versionObj = arr.get(i).asObject(); String tagName = versionObj.get("tag_name").asString(); - if (currentVersion.equals(tagName)) { + if (currentVersion.equals(tagName) || stableTagName.equals(tagName)) { //Stop at current version, do not display more break; }