diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-12-31 11:56:53 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-12-31 11:56:53 -0800 |
| commit | 2325baf34e144586d71251f31c01c7f2abfdb8b7 (patch) | |
| tree | 6dec7e37e75040034d443786d4701e62b38a4d6d /src/modules.js | |
| parent | 8aa6919b7acf0b4034735ac7ee597e946fefaf4d (diff) | |
| parent | a55c2a24a50a93fcf9035eb2a809d13d3a8d3555 (diff) | |
Merge branch 'incoming' into asm_js
Conflicts:
src/library_browser.js
Diffstat (limited to 'src/modules.js')
| -rw-r--r-- | src/modules.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules.js b/src/modules.js index 5c1d6a1d..dd027f73 100644 --- a/src/modules.js +++ b/src/modules.js @@ -307,7 +307,7 @@ var LibraryManager = { loaded: false, load: function() { - assert(!this.library); + if (this.library) return; var libraries = ['library.js', 'library_browser.js', 'library_sdl.js', 'library_gl.js', 'library_glut.js', 'library_xlib.js', 'library_egl.js', 'library_gc.js', 'library_jansson.js'].concat(additionalLibraries); for (var i = 0; i < libraries.length; i++) { |