diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-04-22 10:25:51 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-04-22 10:25:51 -0700 |
| commit | b6834b7094c52fbca9193154d4148f6ff79e18a5 (patch) | |
| tree | 4c635447a7d5221f1e938baf77dd1f15d4d08b8e /src | |
| parent | 326078dbfd2d1b412546dffef81964c3d2ca125d (diff) | |
| parent | fd9e8330eafcdb9112753ed6729954605f357280 (diff) | |
Merge branch 'incoming' of github.com:guillaumeblanc/emscripten into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'src')
| -rw-r--r-- | src/library_glfw.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/library_glfw.js b/src/library_glfw.js index f72aeb24..0b3fccd4 100644 --- a/src/library_glfw.js +++ b/src/library_glfw.js @@ -130,9 +130,11 @@ var LibraryGLFW = { onKeyChanged: function(event, status) { var key = GLFW.DOMToGLFWKeyCode(event.keyCode); - if (key && GLFW.keyFunc) { + if (key) { GLFW.keys[key] = status; - Runtime.dynCall('vii', GLFW.keyFunc, [key, status]); + if (GLFW.keyFunc) { + Runtime.dynCall('vii', GLFW.keyFunc, [key, status]); + } } }, |