display: Don't have the display meta_quit() when closing
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:
parent
6558d43cd5
commit
7b390b4c5b
@ -1138,8 +1138,6 @@ meta_display_close (MetaDisplay *display,
|
||||
|
||||
g_object_unref (display);
|
||||
the_display = NULL;
|
||||
|
||||
meta_quit (META_EXIT_SUCCESS);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -39,6 +39,7 @@
|
||||
#include "core/meta-workspace-manager-private.h"
|
||||
#include "core/window-private.h"
|
||||
#include "core/workspace-private.h"
|
||||
#include "meta/main.h"
|
||||
#include "meta/meta-backend.h"
|
||||
#include "meta/meta-x11-errors.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,
|
||||
x11_display->xselectionclear_timestamp);
|
||||
x11_display->display_close_idle = 0;
|
||||
meta_quit (META_EXIT_SUCCESS);
|
||||
|
||||
return G_SOURCE_REMOVE;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user