Fixed initialization failing on headless systems.

Fixes #482.
This commit is contained in:
Camilla Berglund 2015-03-29 13:46:21 +02:00
parent 49cf82a0ac
commit 2fbd948a67
3 changed files with 6 additions and 7 deletions

View File

@ -62,6 +62,8 @@ GLFW bundles a number of dependencies in the `deps/` directory.
## Changelog
- Bugfix: Initialization failed on headless systems
## Contact

View File

@ -129,13 +129,6 @@ GLFWAPI int glfwInit(void)
}
_glfw.monitors = _glfwPlatformGetMonitors(&_glfw.monitorCount);
if (!_glfw.monitorCount)
{
_glfwInputError(GLFW_PLATFORM_ERROR, "No monitors found");
_glfwPlatformTerminate();
return GL_FALSE;
}
_glfwInitialized = GL_TRUE;
// Not all window hints have zero as their default value

View File

@ -305,6 +305,10 @@ GLFWAPI GLFWmonitor** glfwGetMonitors(int* count)
GLFWAPI GLFWmonitor* glfwGetPrimaryMonitor(void)
{
_GLFW_REQUIRE_INIT_OR_RETURN(NULL);
if (!_glfw.monitorCount)
return NULL;
return (GLFWmonitor*) _glfw.monitors[0];
}