Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 18:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Perform full termination on platform init failure

Browse Source
This commit is contained in:
Camilla Löwy 2017-02-06 16:03:49 +01:00
parent 926d2beddb
commit 0c090a8c8b
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/init.c
View File

@ -77,6 +77,38 @@ static const char* getErrorString(int error)
} }
} }
// Terminate the library
//
static void terminate(void)
{
int i;
memset(&_glfw.callbacks, 0, sizeof(_glfw.callbacks));
while (_glfw.windowListHead)
glfwDestroyWindow((GLFWwindow*) _glfw.windowListHead);
while (_glfw.cursorListHead)
glfwDestroyCursor((GLFWcursor*) _glfw.cursorListHead);
for (i = 0; i < _glfw.monitorCount; i++)
{
_GLFWmonitor* monitor = _glfw.monitors[i];
if (monitor->originalRamp.size)
_glfwPlatformSetGammaRamp(monitor, &monitor->originalRamp);
_glfwFreeMonitor(monitor);
}
free(_glfw.monitors);
_glfw.monitors = NULL;
_glfw.monitorCount = 0;
_glfwTerminateVulkan();
_glfwPlatformTerminate();
memset(&_glfw, 0, sizeof(_glfw));
}
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
////// GLFW event API ////// ////// GLFW event API //////
@ -124,7 +156,7 @@ GLFWAPI int glfwInit(void)
if (!_glfwPlatformInit()) if (!_glfwPlatformInit())
{ {
_glfwPlatformTerminate(); terminate();
return GLFW_FALSE; return GLFW_FALSE;
} }
@ -139,35 +171,10 @@ GLFWAPI int glfwInit(void)
GLFWAPI void glfwTerminate(void) GLFWAPI void glfwTerminate(void)
{ {
int i;
if (!_glfw.initialized) if (!_glfw.initialized)
return; return;
memset(&_glfw.callbacks, 0, sizeof(_glfw.callbacks)); terminate();
while (_glfw.windowListHead)
glfwDestroyWindow((GLFWwindow*) _glfw.windowListHead);
while (_glfw.cursorListHead)
glfwDestroyCursor((GLFWcursor*) _glfw.cursorListHead);
for (i = 0; i < _glfw.monitorCount; i++)
{
_GLFWmonitor* monitor = _glfw.monitors[i];
if (monitor->originalRamp.size)
_glfwPlatformSetGammaRamp(monitor, &monitor->originalRamp);
_glfwFreeMonitor(monitor);
}
free(_glfw.monitors);
_glfw.monitors = NULL;
_glfw.monitorCount = 0;
_glfwTerminateVulkan();
_glfwPlatformTerminate();
memset(&_glfw, 0, sizeof(_glfw));
} }
GLFWAPI void glfwGetVersion(int* major, int* minor, int* rev) GLFWAPI void glfwGetVersion(int* major, int* minor, int* rev)