summaryrefslogtreecommitdiff
path: root/src/x11/meta-x11-display.c
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2023-01-20 18:18:47 +0100
committerMarge Bot <marge-bot@gnome.org>2023-01-20 21:25:02 +0000
commit1f51dfa1126bcb9365bd7581376f871146aebe41 (patch)
tree6af88e862b94db66a002d8836f2e23d33c85b3e1 /src/x11/meta-x11-display.c
parenta9bf493ec7201560f579a08bf4607ef568aee58d (diff)
downloadmutter-1f51dfa1126bcb9365bd7581376f871146aebe41.tar.gz
x11: Wait synchronously for the frames client to exit
This does nothing wrt making race conditions shorter in the X11 window manager switch case, but is a nice to have in order to ensure an orderly shutdown of X11 stuff. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2796>
Diffstat (limited to 'src/x11/meta-x11-display.c')
-rw-r--r--src/x11/meta-x11-display.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c
index 4280163ef..1ad97b2f5 100644
--- a/src/x11/meta-x11-display.c
+++ b/src/x11/meta-x11-display.c
@@ -144,6 +144,8 @@ meta_x11_display_dispose (GObject *object)
if (x11_display->frames_client)
{
g_subprocess_send_signal (x11_display->frames_client, SIGTERM);
+ if (x11_display->display->closing)
+ g_subprocess_wait (x11_display->frames_client, NULL, NULL);
g_clear_object (&x11_display->frames_client);
}