CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-09-04 00:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix #10383

Browse source
This commit is contained in:
Kovid Goyal 2026-08-21 20:38:38 +05:30
parent 9a7892657f
commit 17d2814b4d
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
glfw/wl_init.c vendored
View file

@ -879,12 +879,6 @@ _glfwPlatformTerminate(void) {
}
free(_glfw.wl.activation_requests.array);
}
_glfwTerminateEGL();
if (_glfw.wl.egl.handle) {
_glfw_dlclose(_glfw.wl.egl.handle);
_glfw.wl.egl.handle = NULL;
}
glfw_xkb_release(&_glfw.wl.xkb);
glfw_dbus_terminate(&_glfw.wl.dbus);
@ -941,11 +935,29 @@ _glfwPlatformTerminate(void) {
if (_glfw.wl.pointer_gestures) zwp_pointer_gestures_v1_release(_glfw.wl.pointer_gestures);
if (_glfw.wl.registry) wl_registry_destroy(_glfw.wl.registry);
// Call eglTerminate before disconnecting from the display: eglTerminate
// sends Wayland protocol requests which must be flushed and their closures
// drained before we unload the EGL library. The dlclose calls move to
// after wl_display_disconnect so the message format tables remain mapped
// while the queue is drained, preventing a segfault in
// destroy_queued_closure().
if (_glfw.egl.display) {
eglTerminate(_glfw.egl.display);
_glfw.egl.display = EGL_NO_DISPLAY;
}
if (_glfw.wl.display) {
wl_display_flush(_glfw.wl.display);
wl_display_disconnect(_glfw.wl.display);
_glfw.wl.display = NULL;
}
if (_glfw.egl.handle) {
_glfw_dlclose(_glfw.egl.handle);
_glfw.egl.handle = NULL;
}
if (_glfw.wl.egl.handle) {
_glfw_dlclose(_glfw.wl.egl.handle);
_glfw.wl.egl.handle = NULL;
}
finalizePollData(&_glfw.wl.eventLoopData);
if (_glfw.wl.compositor_name) {
free(_glfw.wl.compositor_name);