diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-09-24 18:25:09 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-09-24 18:25:09 -0700 |
commit | 05b6aa32a5f1633797f7eae390b3a8048b29ca69 (patch) | |
tree | 43543261bb5485b1c109e0e9f93dcb2f7bcd227d /src/library_sdl.js | |
parent | 6010666be99cd0322babba1174cfbc65c776deb5 (diff) | |
parent | 8e2d812b49f7de9487e1c816229106af0cf39d0d (diff) |
Merge branch 'incoming'
Diffstat (limited to 'src/library_sdl.js')
-rw-r--r-- | src/library_sdl.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js index 9383834f..116bf547 100644 --- a/src/library_sdl.js +++ b/src/library_sdl.js @@ -1009,7 +1009,10 @@ var LibrarySDL = { }, SDL_Delay: function(delay) { - abort('SDL_Delay called! Potential infinite loop, quitting.'); + if (!ENVIRONMENT_IS_WORKER) abort('SDL_Delay called on the main thread! Potential infinite loop, quitting.'); + // horrible busy-wait, but in a worker it at least does not block rendering + var now = Date.now(); + while (Date.now() - now < delay) {} }, SDL_WM_SetCaption: function(title, icon) { |