isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 03:20:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

display: Don't have the display meta_quit() when closing

Browse Source 
Instead only do that e.g. when we're being replaced; elsewhere let the
one intending to actually quit, do the quitting.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1833>
This commit is contained in:
Jonas Ådahl 2021-03-01 21:40:40 +01:00 committed by Marge Bot
parent 6558d43cd5
commit 7b390b4c5b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/display.c
View File

@ -1138,8 +1138,6 @@ meta_display_close (MetaDisplay *display,
g_object_unref (display); g_object_unref (display);
the_display = NULL; the_display = NULL;
meta_quit (META_EXIT_SUCCESS);
} }
/** /**

2
src/x11/events.c
View File

@ -39,6 +39,7 @@
#include "core/meta-workspace-manager-private.h" #include "core/meta-workspace-manager-private.h"
#include "core/window-private.h" #include "core/window-private.h"
#include "core/workspace-private.h" #include "core/workspace-private.h"
#include "meta/main.h"
#include "meta/meta-backend.h" #include "meta/meta-backend.h"
#include "meta/meta-x11-errors.h" #include "meta/meta-x11-errors.h"
#include "x11/meta-startup-notification-x11.h" #include "x11/meta-startup-notification-x11.h"
@ -1149,6 +1150,7 @@ close_display_idle_cb (gpointer user_data)
meta_display_close (x11_display->display, meta_display_close (x11_display->display,
x11_display->xselectionclear_timestamp); x11_display->xselectionclear_timestamp);
x11_display->display_close_idle = 0; x11_display->display_close_idle = 0;
meta_quit (META_EXIT_SUCCESS);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }