glfwGetJoystickName() on invalid joysticks, return null

satoshinm · May 5, 2017 · 2d0032e · 2d0032e
1 parent 45f66b3
commit 2d0032e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/library_glfw.js b/src/library_glfw.js
@@ -1454,7 +1454,11 @@ var LibraryGLFW = {
   },
 
   glfwGetJoystickName: function(joy) {
-    return GLFW.active.joys[joy].id;
+    if (GLFW.active.joys[joy]) {
+      return GLFW.active.joys[joy].id;
+    } else {
+      return 0;
+    }
   },
 
   glfwSetJoystickCallback: function(cbfun) {