mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-12 17:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash on monitor disconnection.

Browse Source
This commit is contained in:
Camilla Berglund 2014-03-25 19:37:25 +01:00
parent 2e8d17e7b7
commit bf0adc2c70
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -65,6 +65,8 @@ The following dependencies are needed by the examples and test programs:
- [Cocoa] Bugfix: Some Core Foundation objects were leaked during joystick - [Cocoa] Bugfix: Some Core Foundation objects were leaked during joystick
enumeration enumeration
- [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
found for a given `CGDisplay`
- [Win32] Enabled generation of pkg-config file for MinGW - [Win32] Enabled generation of pkg-config file for MinGW
- [Win32] Bugfix: Failure to load winmm or its functions was not reported to - [Win32] Bugfix: Failure to load winmm or its functions was not reported to
the error callback the error callback

3
src/cocoa_monitor.m
View File

@ -286,8 +286,7 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
else else
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Cocoa: Failed to find NSScreen for CGDisplay %s", "Cocoa: Failed to find NSScreen for CGDisplay");
monitors[found]->name);
_glfwFreeMonitor(monitors[found]); _glfwFreeMonitor(monitors[found]);
monitors[found] = NULL; monitors[found] = NULL;