Moved display closing into _glfwPlatformTerminate.

master
Camilla Berglund ago%!(EXTRA string=11 years)
parent e5d890a1aa
commit 5d525c4a5f
  1. 18
      src/x11_init.c

@ -605,17 +605,6 @@ static Cursor createNULLCursor(void)
return _glfwCreateCursor(&image, 0, 0); return _glfwCreateCursor(&image, 0, 0);
} }
// Terminate X11 display
//
static void terminateDisplay(void)
{
if (_glfw.x11.display)
{
XCloseDisplay(_glfw.x11.display);
_glfw.x11.display = NULL;
}
}
// X error handler // X error handler
// //
static int errorHandler(Display *display, XErrorEvent* event) static int errorHandler(Display *display, XErrorEvent* event)
@ -734,7 +723,12 @@ void _glfwPlatformTerminate(void)
_glfwTerminateJoysticks(); _glfwTerminateJoysticks();
_glfwTerminateContextAPI(); _glfwTerminateContextAPI();
terminateDisplay();
if (_glfw.x11.display)
{
XCloseDisplay(_glfw.x11.display);
_glfw.x11.display = NULL;
}
} }
const char* _glfwPlatformGetVersionString(void) const char* _glfwPlatformGetVersionString(void)

Loading…
Cancel
Save