1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-10-08 07:07:25 -04:00

Removed superfluous nonsense, added platform terminate call on failed platform init.

This commit is contained in:
Camilla Berglund 2010-09-13 22:24:47 +02:00
parent 86c6023daa
commit 0ba1cf9c59

View File

@ -50,9 +50,11 @@ GLFWAPI int glfwInit(void)
memset(&_glfwLibrary, 0, sizeof(_glfwLibrary)); memset(&_glfwLibrary, 0, sizeof(_glfwLibrary));
if (!_glfwPlatformInit()) if (!_glfwPlatformInit())
{
_glfwPlatformTerminate();
return GL_FALSE; return GL_FALSE;
}
// From now on, GLFW state is valid
_glfwInitialized = GL_TRUE; _glfwInitialized = GL_TRUE;
return GL_TRUE; return GL_TRUE;
@ -71,7 +73,6 @@ GLFWAPI void glfwTerminate(void)
if (!_glfwPlatformTerminate()) if (!_glfwPlatformTerminate())
return; return;
// GLFW is no longer initialized
_glfwInitialized = GL_FALSE; _glfwInitialized = GL_FALSE;
} }