From 0ade973ad74dca4dd3f0739657aef5d14b7fdfbb Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Sat, 25 Aug 2018 21:03:29 -0400
Subject: [PATCH] better error reporting in timer callback; .htaccess for
 redir.html cache

---
 .htaccess             |  9 +++++++++
 demo.html             |  6 ------
 scripts/sync-intro.sh |  2 +-
 src/emu.ts            | 17 ++++++-----------
 src/ui.ts             |  1 +
 5 files changed, 17 insertions(+), 18 deletions(-)
 create mode 100644 .htaccess

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 00000000..505be9a0
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,9 @@
+<FilesMatch "redir\.(html|htm)$">
+FileETag None
+<ifModule mod_headers.c>
+Header unset ETag
+Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
+Header set Pragma "no-cache"
+Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
+</ifModule>
+</FilesMatch>
diff --git a/demo.html b/demo.html
index 8147e8d8..aaef0107 100644
--- a/demo.html
+++ b/demo.html
@@ -4,15 +4,9 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-<meta http-equiv="Pragma" content="no-cache" />
-<meta http-equiv="Expires" content="0" />
-    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
     <title>8bitworkshop</title>
-
     <!-- Bootstrap -->
     <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
diff --git a/scripts/sync-intro.sh b/scripts/sync-intro.sh
index 2b12f478..33fea74b 100755
--- a/scripts/sync-intro.sh
+++ b/scripts/sync-intro.sh
@@ -4,6 +4,6 @@
 grep "var VERSION" redir.html
 mkdir -p .tmp
 cp demo.html .tmp/index.html
-rsync -rpilv --chmod=a+rx -e "ssh -p 2222" .tmp/index.html redir.html privacy.html css bootstrap images $RSYNC_PATH/
+rsync -rpilv --chmod=a+rx -e "ssh -p 2222" .tmp/index.html .htaccess redir.html privacy.html css bootstrap images $RSYNC_PATH/
 rm -fr .tmp
 echo "Done."
diff --git a/src/emu.ts b/src/emu.ts
index 3e2d6b6c..dcdf73d9 100644
--- a/src/emu.ts
+++ b/src/emu.ts
@@ -196,25 +196,20 @@ export var AnimationTimer = function(frequencyHz:number, callback:() => void) {
     } else {
       lastts = ts + intervalMsec; // frames skipped, catch up
     }
-    if (running) {
-      scheduleFrame(lastts - ts);
-    } else {
-      pulsing = false;
-    }
     if (!useReqAnimFrame || lastts - ts > intervalMsec/2) {
       if (running) {
-        try {
-          callback();
-        } catch (e) {
-          running = false;
-          throw e;
-        }
+        callback();
       }
       if (nframes == 0) startts = ts;
       if (nframes++ == 300) {
         console.log("Avg framerate: " + nframes*1000/(ts-startts) + " fps");
       }
     }
+    if (running) {
+      scheduleFrame(lastts - ts);
+    } else {
+      pulsing = false;
+    }
   }
   this.isRunning = function() {
     return running;
diff --git a/src/ui.ts b/src/ui.ts
index d84bd1e9..89eede9c 100644
--- a/src/ui.ts
+++ b/src/ui.ts
@@ -951,6 +951,7 @@ function installErrorHandler() {
           'exFatal': true
         });
         alert(msgevent+"");
+        _pause();
       };
   }
 }