From 7197c115868beb831a1d5309635b27406f044b8a Mon Sep 17 00:00:00 2001
From: Dennis Ranke <dennis.ranke@gmail.com>
Date: Sat, 5 Mar 2022 23:10:04 +0100
Subject: [PATCH] fix microw8.html no-autoload mode

---
 web/src/index.html | 4 ++--
 web/src/main.js    | 4 +++-
 web/src/microw8.js | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/web/src/index.html b/web/src/index.html
index 58d3eed..3d4d49e 100644
--- a/web/src/index.html
+++ b/web/src/index.html
@@ -15,8 +15,8 @@
         <div id="centered">
             <canvas id="screen" width="320" height="240">
             </canvas>
-        <div id="timer" hidden="true"></div>        
-        <div id="message"></div>
+            <div id="timer" hidden="true"></div>        
+            <div id="message"></div>
             <button id="cartButton" style="visibility:hidden">Load cart...</button>
         </div>
         <div id="footer">
diff --git a/web/src/main.js b/web/src/main.js
index 536951d..3e913c9 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -79,7 +79,9 @@ if(location.hash.length != 0) {
             url += 'cart.uw8';
         }
         try {
-            await uw8.runModuleFromURL(url, true);
+            if(!await uw8.runModuleFromURL(url, true)) {
+                setupLoad();
+            }
         } catch(e) {
             setupLoad();
         }
diff --git a/web/src/microw8.js b/web/src/microw8.js
index 26f347c..6ec6520 100644
--- a/web/src/microw8.js
+++ b/web/src/microw8.js
@@ -305,10 +305,11 @@ export default function MicroW8(screen, config = {}) {
     async function runModuleFromURL(url, keepUrl) {
         let response = await fetch(url);
         let type = response.headers.get('Content-Type');
-        if(type && type.includes('html')) {
-            throw false;
+        if((type && type.includes('html')) || response.status != 200) {
+            return false;
         }
         runModule(await response.arrayBuffer(), keepUrl || devkitMode);
+        return true;
     }
 
     return {