From 074a9486aef3b9de09b2ff6ef30afe0423231567 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Tue, 11 Nov 2025 16:23:16 +0100
Subject: [PATCH] Fixed so that undefined flag doesn't cause an error (#1259)

---
 module/canvas/placeables/measuredTemplate.mjs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/canvas/placeables/measuredTemplate.mjs b/module/canvas/placeables/measuredTemplate.mjs
index fa91fa9f..ef7d284b 100644
--- a/module/canvas/placeables/measuredTemplate.mjs
+++ b/module/canvas/placeables/measuredTemplate.mjs
@@ -21,17 +21,17 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur
         const sceneRangeMeasurement = canvas.scene.flags.daggerheart?.rangeMeasurement;
 
         const { disable, custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting;
-        if (sceneRangeMeasurement.setting === disable.id) {
+        if (sceneRangeMeasurement?.setting === disable.id) {
             result.distance = distanceValue;
             result.units = canvas.scene?.grid?.units;
             return result;
         }
 
-        const melee = sceneRangeMeasurement.setting === custom.id ? sceneRangeMeasurement.melee : settings.melee;
+        const melee = sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement.melee : settings.melee;
         const veryClose =
-            sceneRangeMeasurement.setting === custom.id ? sceneRangeMeasurement.veryClose : settings.veryClose;
-        const close = sceneRangeMeasurement.setting === custom.id ? sceneRangeMeasurement.close : settings.close;
-        const far = sceneRangeMeasurement.setting === custom.id ? sceneRangeMeasurement.far : settings.far;
+            sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement.veryClose : settings.veryClose;
+        const close = sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement.close : settings.close;
+        const far = sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement.far : settings.far;
         if (distanceValue <= melee) {
             result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.melee.name');
             return result;