summaryrefslogtreecommitdiff
path: root/src/wayland/meta-xwayland.c
diff options
context:
space:
mode:
authorOlivier Fourdan <ofourdan@redhat.com>2021-01-13 18:25:06 +0100
committerOlivier Fourdan <ofourdan@redhat.com>2021-01-21 08:48:39 +0100
commit1bd42e8779bbdcb5100d69f90309f48dfe3794cd (patch)
treed62591af8ad7acf919849f785aaf04fdaab795d7 /src/wayland/meta-xwayland.c
parent063db30c50bded75a286057d42d3c1e79db6a3f8 (diff)
downloadmutter-1bd42e8779bbdcb5100d69f90309f48dfe3794cd.tar.gz
xwayland: Propagate error if display sockets failed
In case of failure to open the display sockets, we would not propagatre the error which can cause a crash when trying to show the error message. Properly propagate the error to avoid the crash. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1669>
Diffstat (limited to 'src/wayland/meta-xwayland.c')
-rw-r--r--src/wayland/meta-xwayland.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 1343a7d05..56a50b134 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -711,7 +711,8 @@ choose_xdisplay (MetaXWaylandManager *manager,
}
else
{
- g_warning ("Failed to bind X11 socket");
+ g_prefix_error (&local_error, "Failed to bind X11 socket: ");
+ g_propagate_error (error, g_steal_pointer (&local_error));
return FALSE;
}
}