Merge pull request #136 from redweller/fix/randomcrash

TheGiddyLimit · Sep 21, 2022 · 18ab299 · 18ab299
2 parents 8683914 + cdc470b
commit 18ab299
Showing 1 changed file with 21 additions and 16 deletions.
diff --git a/js/base-qpi.js b/js/base-qpi.js
@@ -19,26 +19,31 @@ function baseQpi () {
 			on: {
 				_preInit () {
 					qpi._on_chatHandlers = [];
-					const seenMessages = new Set();
-					d20.textchat.chatref = d20.textchat.shoutref.parent.child("chat");
-					const handleChat = (e) => {
-						if (!d20.textchat.chatstartingup) {
-							e.id = e.key;
-							if (!seenMessages.has(e.id)) {
-								seenMessages.add(e.id);
+					if (d20.textchat.shoutref) {
+						const seenMessages = new Set();
+						d20.textchat.chatref = d20.textchat.shoutref.parent.child("chat");
+						const handleChat = (e) => {
+							if (!d20.textchat.chatstartingup) {
+								e.id = e.key;
+								if (!seenMessages.has(e.id)) {
+									seenMessages.add(e.id);
 
-								let t = e.val();
-								if (t) {
-									// eslint-disable-next-line no-console
-									if (window.DEBUG) console.log("CHAT: ", t);
+									let t = e.val();
+									if (t) {
+										// eslint-disable-next-line no-console
+										if (window.DEBUG) console.log("CHAT: ", t);
 
-									qpi._on_chatHandlers.forEach(fn => fn(t));
+										qpi._on_chatHandlers.forEach(fn => fn(t));
+									}
 								}
 							}
-						}
-					};
-					d20.textchat.chatref.on("child_added", handleChat);
-					d20.textchat.chatref.on("child_changed", handleChat);
+						};
+						d20.textchat.chatref.on("child_added", handleChat);
+						d20.textchat.chatref.on("child_changed", handleChat);
+					} else {
+						// eslint-disable-next-line no-console
+						console.warn("%cQPI > ", "color: #b93032; font-size: large", "Can't properly initialize chat handler");
+					}
 				},
 				_ (evtType, fn, ...others) {
 					switch (evtType) {