mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-14 08:22:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'github/fork/quantum5/wl-event-source-remove-null' into 'master'

Browse source 
xwayland_socket_connected: avoid calling wl_event_source_remove on NULL

See merge request wlroots/wlroots!2224
This commit is contained in:
Quantum 2026-01-14 13:50:59 +00:00
commit cd66fdfbe0
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xwayland/server.c
View file

@ -412,8 +412,12 @@ static bool server_start(struct wlr_xwayland_server *server) {
static int xwayland_socket_connected(int fd, uint32_t mask, void *data) { static int xwayland_socket_connected(int fd, uint32_t mask, void *data) {
struct wlr_xwayland_server *server = data; struct wlr_xwayland_server *server = data;
wl_event_source_remove(server->x_fd_read_event[0]); if (server->x_fd_read_event[0]) {
wl_event_source_remove(server->x_fd_read_event[1]); wl_event_source_remove(server->x_fd_read_event[0]);
}
if (server->x_fd_read_event[1]) {
wl_event_source_remove(server->x_fd_read_event[1]);
}
server->x_fd_read_event[0] = server->x_fd_read_event[1] = NULL; server->x_fd_read_event[0] = server->x_fd_read_event[1] = NULL;
server_start(server); server_start(server);