From 85e868a351091548c3b1763297612ab64bad4b47 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Mon, 26 Aug 2024 03:53:35 +0200 Subject: [PATCH] fix: showUploadMessage function not called correctly for isUpdated case --- modules/io/load.js | 6 +++--- versioning.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/io/load.js b/modules/io/load.js index 19a155c1..05932065 100644 --- a/modules/io/load.js +++ b/modules/io/load.js @@ -119,7 +119,7 @@ function uploadMap(file, callback) { const isOutdated = compareVersions(mapVersion, version).isOlder; if (isInvalid) return showUploadMessage("invalid", mapData, mapVersion); - if (isUpdated) return parseLoadedData("updated", mapData, mapVersion); + if (isUpdated) return showUploadMessage("updated", mapData, mapVersion); if (isAncient) return showUploadMessage("ancient", mapData, mapVersion); if (isNewer) return showUploadMessage("newer", mapData, mapVersion); if (isOutdated) return showUploadMessage("outdated", mapData, mapVersion); @@ -169,8 +169,8 @@ async function parseLoadedResult(result) { const decoded = isDelimited ? resultAsString : decodeURIComponent(atob(resultAsString)); const mapData = decoded.split("\r\n"); - const mapVersion = mapData[0].split("|")[0] || mapData[0]; - return [mapData, mapVersion]; + const mapVersionString = mapData[0].split("|")[0] || mapData[0] || ""; + return [mapData, mapVersionString]; } catch (error) { // map file can be compressed with gzip const uncompressedData = await uncompress(result); diff --git a/versioning.js b/versioning.js index 0c74a022..8de40547 100644 --- a/versioning.js +++ b/versioning.js @@ -9,10 +9,10 @@ const version = "1.100.00"; // generator version, update each time if (loadingScreenVersion) loadingScreenVersion.innerText = `v${version}`; const storedVersion = localStorage.getItem("version"); - if (isOutdated(storedVersion)) await clearCache(); - - const showUpdate = storedVersion < versionNumber; - if (showUpdate) setTimeout(showUpdateWindow, 6000); + if (isOutdated(storedVersion)) { + await clearCache(); + setTimeout(showUpdateWindow, 6000); + } function showUpdateWindow() { const changelog = "https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Changelog";