Fixes glfwGetKey that always returns 0 if no callback is set with glfwSetKeyCallback; fixes #1320

2 files changed, 5 insertions, 3 deletions

diff --git a/AUTHORS b/AUTHORS
index 99703f93..ad372e92 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -134,4 +134,4 @@ a license to everyone to use it as detailed in LICENSE.)
 * Daniele Di Proietto <daniele.di.proietto@gmail.com>
 * Dan Dascalescu <dNOSPAMdascalescu@gmail.com>
 * Thomas Borsos <thomasborsos@gmail.com>
-
+* Guillaume Blanc <guillaumeblanc.sc@gmail.com>
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]);
+        }
       }
     },