mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-25 06:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved cursor object freeing to better place.

Browse Source
This commit is contained in:
Camilla Berglund 2010-09-11 15:42:32 +02:00
parent 93bfa847ff
commit 8c507dc333
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/x11/x11_init.c
View File

@ -175,12 +175,6 @@ static Cursor createNULLCursor(void)
static void terminateDisplay(void) static void terminateDisplay(void)
{ {
if (_glfwLibrary.X11.cursor)
{
XFreeCursor(_glfwLibrary.X11.display, _glfwLibrary.X11.cursor);
_glfwLibrary.X11.cursor = (Cursor) 0;
}
if (_glfwLibrary.X11.display) if (_glfwLibrary.X11.display)
{ {
XCloseDisplay(_glfwLibrary.X11.display); XCloseDisplay(_glfwLibrary.X11.display);
@ -229,6 +223,12 @@ int _glfwPlatformTerminate(void)
while (_glfwLibrary.windowListHead) while (_glfwLibrary.windowListHead)
glfwCloseWindow(_glfwLibrary.windowListHead); glfwCloseWindow(_glfwLibrary.windowListHead);
if (_glfwLibrary.X11.cursor)
{
XFreeCursor(_glfwLibrary.X11.display, _glfwLibrary.X11.cursor);
_glfwLibrary.X11.cursor = (Cursor) 0;
}
// Terminate display // Terminate display
terminateDisplay(); terminateDisplay();