Make displayed Web errors more meaningful

godotengine · May 30, 2024 · 2c3b871 · 2c3b871
1 parent e7dd6f1
commit 2c3b871
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/misc/dist/html/editor.html b/misc/dist/html/editor.html
@@ -701,9 +701,14 @@ <h2 id="welcome-modal-title" class="welcome-modal-title">Important - Please read
 	editor = new Engine(editorConfig);
 
 	function displayFailureNotice(err) {
-		const msg = err.message || err;
-		console.error(msg);
-		setStatusNotice(msg);
+		console.error(err);
+		if (err instanceof Error) {
+			setStatusNotice(err.message);
+		} else if (typeof err === 'string') {
+			setStatusNotice(err);
+		} else {
+			setStatusNotice('An unknown error occured');
+		}
 		setStatusMode('notice');
 		initializing = false;
 	}

diff --git a/misc/dist/html/full-size.html b/misc/dist/html/full-size.html
@@ -134,9 +134,14 @@
 	}
 
 	function displayFailureNotice(err) {
-		const msg = err.message || err;
-		console.error(msg);
-		setStatusNotice(msg);
+		console.error(err);
+		if (err instanceof Error) {
+			setStatusNotice(err.message);
+		} else if (typeof err === 'string') {
+			setStatusNotice(err);
+		} else {
+			setStatusNotice('An unknown error occured');
+		}
 		setStatusMode('notice');
 		initializing = false;
 	}