From af927ed345506fbefef78fe74d3f0f0ff7e5222e Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Sun, 24 Mar 2024 17:53:00 +0100
Subject: [PATCH] fix: check scheme before setting

---
 index.html                     |  2 +-
 modules/dynamic/auto-update.js |  2 +-
 modules/io/load.js             | 10 +++++-----
 versioning.js                  |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index 4bf4095c..9fa9dbc7 100644
--- a/index.html
+++ b/index.html
@@ -8093,7 +8093,7 @@
     <script defer src="libs/rgbquant.min.js"></script>
     <script defer src="libs/jquery.ui.touch-punch.min.js"></script>
     <script defer src="modules/io/save.js?v=1.96.00"></script>
-    <script defer src="modules/io/load.js?v=1.97.02"></script>
+    <script defer src="modules/io/load.js?v=1.97.04"></script>
     <script defer src="modules/io/cloud.js?v=1.96.00"></script>
     <script defer src="modules/io/export.js?v=1.97.03"></script>
 
diff --git a/modules/dynamic/auto-update.js b/modules/dynamic/auto-update.js
index a77ddd45..85f623f9 100644
--- a/modules/dynamic/auto-update.js
+++ b/modules/dynamic/auto-update.js
@@ -743,7 +743,7 @@ export function resolveVersionConflicts(version) {
 
     const opacity = terrs.attr("opacity");
     const filter = terrs.attr("filter");
-    const scheme = terrs.attr("scheme");
+    const scheme = terrs.attr("scheme") || "bright";
     const terracing = terrs.attr("terracing");
     const skip = terrs.attr("skip");
     const relax = terrs.attr("relax");
diff --git a/modules/io/load.js b/modules/io/load.js
index c038eb5c..ff6b2731 100644
--- a/modules/io/load.js
+++ b/modules/io/load.js
@@ -456,16 +456,16 @@ async function parseLoadedData(data, mapVersion) {
     {
       // dynamically import and run auto-update script
       const versionNumber = parseFloat(params[0]);
-      const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=1.97.00");
+      const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=1.97.04");
       resolveVersionConflicts(versionNumber);
     }
 
     // add custom heightmap color scheme if any
     if (heightmapColorSchemes) {
-      const oceanScheme = terrs.select("#oceanHeights").attr("scheme");
-      const landScheme = terrs.select("#landHeights").attr("scheme");
-      if (!(oceanScheme in heightmapColorSchemes)) addCustomColorScheme(oceanScheme);
-      if (!(landScheme in heightmapColorSchemes)) addCustomColorScheme(landScheme);
+      const oceanScheme = byId("oceanHeights")?.getAttribute("scheme");
+      if (oceanScheme && !(oceanScheme in heightmapColorSchemes)) addCustomColorScheme(oceanScheme);
+      const landScheme = byId("#landHeights")?.getAttribute("scheme");
+      if (landScheme && !(landScheme in heightmapColorSchemes)) addCustomColorScheme(landScheme);
     }
 
     {
diff --git a/versioning.js b/versioning.js
index 1639a60b..1574e729 100644
--- a/versioning.js
+++ b/versioning.js
@@ -1,7 +1,7 @@
 "use strict";
 
 // version and caching control
-const version = "1.97.03"; // generator version, update each time
+const version = "1.97.04"; // generator version, update each time
 
 {
   document.title += " v" + version;