[mutter] wayland: Do not fail on stalled .X11-unix entries
- From: Olivier Fourdan <ofourdan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] wayland: Do not fail on stalled .X11-unix entries
- Date: Mon, 5 Feb 2018 11:38:02 +0000 (UTC)
commit 589e999049d00d56aafcc2fa3c1e63cee5b3182b
Author: Olivier Fourdan <ofourdan redhat com>
Date: Fri Feb 2 16:35:26 2018 +0100
wayland: Do not fail on stalled .X11-unix entries
If for whatever reason, there are stalled files in /tmp/.X11-unix/ the
bind() to the abstract socket will succeed but not the bind() to the
to the UNIX socket.
This causes gnome-shell/mutter to fail because it cannot start Xwayland
(while it could actually, by using a different display).
In case of failure to bind to the UNIX socket, try the next display
instead of failing, to avoid stalled entries in /tmp/.X11-unix.
Closes: https://gitlab.gnome.org/GNOME/mutter/issues/13
src/wayland/meta-xwayland.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index b185c0a5f..19b95c636 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -465,7 +465,8 @@ choose_xdisplay (MetaXWaylandManager *manager)
{
unlink (lock_file);
close (manager->abstract_fd);
- return FALSE;
+ display++;
+ continue;
}
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]