From 53c3cbfe268e0dcab10b343e1b0bac46e676f097 Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Sat, 15 Jan 2022 12:30:57 +0100
Subject: [PATCH] Show errors when loading mods

---
 src/js/mods/modloader.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js
index f5145207..d7e10391 100644
--- a/src/js/mods/modloader.js
+++ b/src/js/mods/modloader.js
@@ -94,19 +94,29 @@ export class ModLoader {
                 }
 
                 mods.forEach(modCode => {
-                    const func = new Function(modCode);
-                    func();
+                    try {
+                        const func = new Function(modCode);
+                        const response = func();
+                    } catch (ex) {
+                        console.error(ex);
+                        alert("Failed to parse mod (launch with --dev for more info): " + ex);
+                    }
                 });
             } catch (ex) {
-                alert("Failed to load mods: " + ex);
+                alert("Failed to load mods (launch with --dev for more info): " + ex);
             }
         }
 
         this.initialized = true;
         this.modLoadQueue.forEach(modClass => {
-            const mod = new (modClass())(this.app, this);
-            mod.init();
-            this.mods.push(mod);
+            try {
+                const mod = new (modClass())(this.app, this);
+                mod.init();
+                this.mods.push(mod);
+            } catch (ex) {
+                console.error(ex);
+                alert("Failed to initialize mods (launch with --dev for more info): " + ex);
+            }
         });
         this.modLoadQueue = [];
         this.signals.postInit.dispatch();