[gnome-shell] shell-global: Ignore modal operations if we have no compositor
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] shell-global: Ignore modal operations if we have no compositor
- Date: Tue, 8 Oct 2019 16:41:15 +0000 (UTC)
commit 31fe517007c4b5e6cb4497c5537a5e7ba6b7ccfb
Author: Marco Trevisan (Treviño) <mail 3v1n0 net>
Date: Wed Oct 2 21:56:05 2019 +0200
shell-global: Ignore modal operations if we have no compositor
Modal dialog actions might be triggered during display closing, and in such
cases we should just ignore the requests.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/746
src/shell-global.c | 6 ++++++
1 file changed, 6 insertions(+)
---
diff --git a/src/shell-global.c b/src/shell-global.c
index 7f74a34fd8..77e167c107 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -943,6 +943,9 @@ shell_global_begin_modal (ShellGlobal *global,
guint32 timestamp,
MetaModalOptions options)
{
+ if (!meta_display_get_compositor (global->meta_display))
+ return FALSE;
+
/* Make it an error to call begin_modal while we already
* have a modal active. */
if (global->has_modal)
@@ -964,6 +967,9 @@ void
shell_global_end_modal (ShellGlobal *global,
guint32 timestamp)
{
+ if (!meta_display_get_compositor (global->meta_display))
+ return;
+
if (!global->has_modal)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]