aboutsummaryrefslogtreecommitdiff
path: root/src/library_browser.js
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-09-12 14:47:17 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-09-12 14:47:17 -0700
commit6010666be99cd0322babba1174cfbc65c776deb5 (patch)
treedad63b03b751394c169de61fbf2c195f4faf5344 /src/library_browser.js
parent38890204ed1f5f8dd34cced7c42fc9cf42dccab5 (diff)
parentf9dff9b3f2e95b2ca8e5b8fd97538f301fd080fe (diff)
Merge branch 'incoming'
Diffstat (limited to 'src/library_browser.js')
-rw-r--r--src/library_browser.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/library_browser.js b/src/library_browser.js
index 235ccc78..e4966e15 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -724,7 +724,15 @@ mergeInto(LibraryManager.library, {
Module['preMainLoop']();
}
- Runtime.dynCall('v', func);
+ try {
+ Runtime.dynCall('v', func);
+ } catch (e) {
+ if (e instanceof ExitStatus) {
+ return;
+ } else {
+ throw e;
+ }
+ }
if (Module['postMainLoop']) {
Module['postMainLoop']();