Fixed leaks of joystick mutable arrays.

This commit is contained in:
Camilla Berglund 2014-05-29 13:19:08 +02:00
parent 8f2336f02c
commit c6e02c09ff
2 changed files with 8 additions and 1 deletions

View File

@ -69,7 +69,7 @@ The following dependencies are needed by the examples and test programs:
- [Cocoa] Bugfix: Using a 1x1 cursor for hidden mode caused some screen - [Cocoa] Bugfix: Using a 1x1 cursor for hidden mode caused some screen
recorders to fail recorders to fail
- [Cocoa] Bugfix: Some Core Foundation objects were leaked during joystick - [Cocoa] Bugfix: Some Core Foundation objects were leaked during joystick
enumeration enumeration and termination
- [Cocoa] Bugfix: One copy of each display name string was leaked - [Cocoa] Bugfix: One copy of each display name string was leaked
- [Cocoa] Bugfix: Monitor enumeration caused a segfault if no `NSScreen` was - [Cocoa] Bugfix: Monitor enumeration caused a segfault if no `NSScreen` was
found for a given `CGDisplay` found for a given `CGDisplay`

View File

@ -443,6 +443,13 @@ void _glfwTerminateJoysticks(void)
{ {
_GLFWjoystickIOKit* joystick = &_glfw.iokit_js[i]; _GLFWjoystickIOKit* joystick = &_glfw.iokit_js[i];
removeJoystick(joystick); removeJoystick(joystick);
if (joystick->axisElements)
CFRelease(joystick->axisElements);
if (joystick->buttonElements)
CFRelease(joystick->buttonElements);
if (joystick->hatElements)
CFRelease(joystick->hatElements);
} }
} }