Fix for setting update

Fix #216
mclemente · Nov 2, 2023 · 8b3ba83 · 8b3ba83
1 parent b82ea7a
commit 8b3ba83
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 26 deletions.
diff --git a/src/module/healthEstimate.js b/src/module/healthEstimate.js
@@ -8,6 +8,7 @@ Hooks.once("i18nInit", function () {
 });
 
 Hooks.once("setup", () => game.healthEstimate.setup());
+Hooks.once("ready", () => game.healthEstimate.ready());
 
 // Canvas
 Hooks.once("canvasReady", HealthEstimateHooks.onceCanvasReady);

diff --git a/src/module/logic.js b/src/module/logic.js
@@ -35,6 +35,34 @@ export class HealthEstimate {
 		this.updateSettings();
 	}
 
+	ready() {
+		// Setting change handling
+		if (!Number.isNumeric(this.fontSize)) {
+			if (!isNaN(this.fontSize) && this.fontSize.match(/[0-9]*\.?[0-9]+(px|%)+/i)) {
+				this.fontSize = Number(this.fontSize.replace(/(px|%)+/i, ""));
+			} else {
+				console.warn(
+					`Health Estimate | ${game.i18n.format("healthEstimate.notifications.invalidFontSize", {
+						fontSize: this.fontSize,
+					})}`
+				);
+				this.fontSize = 24;
+			}
+			sSet("core.menuSettings.fontSize", this.fontSize || 24);
+		}
+		if (!Number.isNumeric(this.height)) {
+			const heights = {
+				top: "a",
+				center: "b",
+				end: "c",
+			};
+			this.position = heights[this.height];
+			this.height = 0;
+			sSet("core.menuSettings.position", 0);
+			sSet("core.menuSettings.position2", this.position);
+		}
+	}
+
 	/**
 	 * Gets system specifics, such as its hp attribute and other settings.
 	 * @returns {providers.EstimationProvider}
@@ -343,31 +371,5 @@ export class HealthEstimate {
 		this.outline = sGet("core.variables.outline");
 		this.deadColor = sGet("core.variables.deadColor");
 		this.deadOutline = sGet("core.variables.deadOutline");
-
-		// Setting change handling
-		if (!Number.isNumeric(this.fontSize)) {
-			if (!isNaN(this.fontSize) && this.fontSize.match(/[0-9]*\.?[0-9]+(px|%)+/i)) {
-				this.fontSize = Number(this.fontSize.replace(/(px|%)+/i, ""));
-			} else {
-				console.warn(
-					`Health Estimate | ${game.i18n.format("healthEstimate.notifications.invalidFontSize", {
-						fontSize: this.fontSize,
-					})}`
-				);
-				this.fontSize = 24;
-			}
-			sSet("core.menuSettings.fontSize", this.fontSize || 24);
-		}
-		if (!Number.isNumeric(this.height)) {
-			const heights = {
-				top: "a",
-				center: "b",
-				end: "c",
-			};
-			this.position = heights[this.height];
-			this.height = 0;
-			sSet("core.menuSettings.position", 0);
-			sSet("core.menuSettings.position2", this.position);
-		}
 	}
 }