1 files changed, 29 insertions, 4 deletions

diff --git a/src/library_browser.js b/src/library_browser.js
index 0ed04e19..2e6c9150 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -184,7 +184,7 @@ mergeInto(LibraryManager.library, {
           };
           audio.src = url;
           // workaround for chrome bug 124926 - we do not always get oncanplaythrough or onerror
-          setTimeout(function() {
+          Browser.safeSetTimeout(function() {
             finish(audio); // try to use it even though it is not necessarily ready to play
           }, 10000);
         } else {
@@ -361,6 +361,30 @@ mergeInto(LibraryManager.library, {
       window.requestAnimationFrame(func);
     },
 
+    // generic abort-aware wrapper for an async callback
+    safeCallback: function(func) {
+      return function() {
+        if (!ABORT) return func.apply(null, arguments);
+      };
+    },
+
+    // abort-aware versions
+    safeRequestAnimationFrame: function(func) {
+      Browser.requestAnimationFrame(function() {
+        if (!ABORT) func();
+      });
+    },
+    safeSetTimeout: function(func, timeout) {
+      setTimeout(function() {
+        if (!ABORT) func();
+      }, timeout);
+    },
+    safeSetInterval: function(func, timeout) {
+      setInterval(function() {
+        if (!ABORT) func();
+      }, timeout);
+    },
+
     getMovementX: function(event) {
       return event['movementX'] ||
              event['mozMovementX'] ||
@@ -612,7 +636,7 @@ mergeInto(LibraryManager.library, {
     Module['noExitRuntime'] = true;
 
     // TODO: cache these to avoid generating garbage
-    setTimeout(function() {
+    Browser.safeSetTimeout(function() {
       _emscripten_run_script(script);
     }, millis);
   },
@@ -621,6 +645,7 @@ mergeInto(LibraryManager.library, {
     Module['noExitRuntime'] = true;
 
     Browser.mainLoop.runner = function() {
+      if (ABORT) return;
       if (Browser.mainLoop.queue.length > 0) {
         var start = Date.now();
         var blocker = Browser.mainLoop.queue.shift();
@@ -723,9 +748,9 @@ mergeInto(LibraryManager.library, {
     }
 
     if (millis >= 0) {
-      setTimeout(wrapper, millis);
+      Browser.safeSetTimeout(wrapper, millis);
     } else {
-      Browser.requestAnimationFrame(wrapper);
+      Browser.safeRequestAnimationFrame(wrapper);
     }
   },