Don't do anything if emotes don't exist

JsSucks · Mar 10, 2018 · b0fcedd · b0fcedd
1 parent fe319e5
commit b0fcedd
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/client/src/builtin/EmoteModule.js b/client/src/builtin/EmoteModule.js
@@ -17,11 +17,16 @@ export default class {
 
     static async observe() {
         const dataPath = Globals.getObject('paths').find(path => path.id === 'data').path;
-        emotes =  await FileUtils.readJsonFromFile(dataPath + '/emotes.json');
-        window.emotee = emotes;
-        Events.on('ui:mutable:.markup', markup => {
-            this.injectEmotes(markup);
-        });
+        try {
+            emotes = await FileUtils.readJsonFromFile(dataPath + '/emotes.json');
+            Events.on('ui:mutable:.markup',
+                markup => {
+                    if (!emotes) return;
+                    this.injectEmotes(markup);
+                });
+        } catch (err) {
+            console.log(err);
+        }
     }
 
     static injectEmotes(node) {