Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formatting and comments.

Browse Source
This commit is contained in:
Camilla Berglund 2010-09-16 02:05:01 +02:00
parent 8308c4b89b
commit 33b2195fb9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/window.c
View File

@ -703,8 +703,6 @@ GLFWAPI void glfwOpenWindowHint(int target, int hint)
GLFWAPI void glfwCloseWindow(GLFWwindow window) GLFWAPI void glfwCloseWindow(GLFWwindow window)
{ {
_GLFWwindow** prev;
if (!_glfwInitialized) if (!_glfwInitialized)
{ {
_glfwSetError(GLFW_NOT_INITIALIZED); _glfwSetError(GLFW_NOT_INITIALIZED);
@ -715,19 +713,25 @@ GLFWAPI void glfwCloseWindow(GLFWwindow window)
if (window == _glfwLibrary.cursorLockWindow) if (window == _glfwLibrary.cursorLockWindow)
glfwEnable(window, GLFW_MOUSE_CURSOR); glfwEnable(window, GLFW_MOUSE_CURSOR);
// Clear the current context if this window's context is current
if (window == _glfwLibrary.currentWindow) if (window == _glfwLibrary.currentWindow)
glfwMakeWindowCurrent(NULL); glfwMakeWindowCurrent(NULL);
// Clear the active window pointer if this is the active window
if (window == _glfwLibrary.activeWindow) if (window == _glfwLibrary.activeWindow)
_glfwLibrary.activeWindow = NULL; _glfwLibrary.activeWindow = NULL;
_glfwPlatformCloseWindow(window); _glfwPlatformCloseWindow(window);
prev = &_glfwLibrary.windowListHead; // Unlink window from global linked list
while (*prev != window) {
prev = &((*prev)->next); _GLFWwindow** prev = &_glfwLibrary.windowListHead;
*prev = window->next; while (*prev != window)
prev = &((*prev)->next);
*prev = window->next;
}
free(window); free(window);
} }