From eccfd96e6720a31eaff66bd8e543a62964435220 Mon Sep 17 00:00:00 2001
From: Oliver-Akins <Oliver.akins1999@gmail.com>
Date: Mon, 14 Jul 2025 21:43:27 -0600
Subject: [PATCH] Make it so that the setting change doesn't error when no
 combat is started

---
 module/settings/metaSettings.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/settings/metaSettings.mjs b/module/settings/metaSettings.mjs
index 1096eec..5acdbe9 100644
--- a/module/settings/metaSettings.mjs
+++ b/module/settings/metaSettings.mjs
@@ -47,7 +47,7 @@ export function registerMetaSettings() {
 		requiresReload: false,
 		default: `friendly`,
 		onChange: async () => {
-			await game.combat.setupTurns();
+			await game.combat?.setupTurns();
 			await ui.combat.render({ parts: [ `tracker` ] });
 		},
 	});