mirror of
https://github.com/glfw/glfw.git
synced 2024-11-13 14:03:52 +00:00
Moved cursor object freeing to better place.
This commit is contained in:
parent
93bfa847ff
commit
8c507dc333
@ -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();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user