mirror of
https://github.com/glfw/glfw.git
synced 2025-07-26 09:30:02 +00:00
Merge ee38126be5
into ac10768495
This commit is contained in:
commit
1c156cd9fd
@ -1261,11 +1261,8 @@ GLFWAPI void* glfwGetJoystickUserPointer(int jid)
|
||||
GLFWAPI GLFWjoystickfun glfwSetJoystickCallback(GLFWjoystickfun cbfun)
|
||||
{
|
||||
_GLFW_REQUIRE_INIT_OR_RETURN(NULL);
|
||||
|
||||
if (!initJoysticks())
|
||||
return NULL;
|
||||
|
||||
_GLFW_SWAP(GLFWjoystickfun, _glfw.callbacks.joystick, cbfun);
|
||||
initJoysticks();
|
||||
return cbfun;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user