|
 |
88c283 |
From 9a8bb8a205656ca1089444a041c99c5591477642 Mon Sep 17 00:00:00 2001
|
|
|
88c283 |
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
|
88c283 |
Date: Fri, 3 May 2019 18:10:47 +0000
|
|
|
88c283 |
Subject: [PATCH 2/2] window: Emit an error and return when trying to activate
|
|
|
88c283 |
an unmanaged
|
|
|
88c283 |
|
|
|
88c283 |
If something (i.e. gnome-shell or an extension) tries to activate an unmanaged
|
|
|
88c283 |
window, we should warn about this and avoid to perform further actions as this
|
|
|
88c283 |
could lead to a crash of mutter, since the window has not valid flags (like
|
|
|
88c283 |
workspace) set anymore at this stage.
|
|
|
88c283 |
|
|
|
88c283 |
Fixes https://gitlab.gnome.org/GNOME/mutter/issues/580
|
|
|
88c283 |
|
|
|
88c283 |
https://gitlab.gnome.org/GNOME/mutter/merge_requests/564
|
|
|
88c283 |
|
|
|
88c283 |
|
|
|
88c283 |
(cherry picked from commit a6fc656e917fd48b8708b8d9f4bf9f8b15581313)
|
|
|
88c283 |
---
|
|
|
88c283 |
src/core/window.c | 7 +++++++
|
|
|
88c283 |
1 file changed, 7 insertions(+)
|
|
|
88c283 |
|
|
|
88c283 |
diff --git a/src/core/window.c b/src/core/window.c
|
|
|
88c283 |
index d2c24506b..725cca7ce 100644
|
|
|
88c283 |
--- a/src/core/window.c
|
|
|
88c283 |
+++ b/src/core/window.c
|
|
|
88c283 |
@@ -3683,6 +3683,13 @@ meta_window_activate_full (MetaWindow *window,
|
|
|
88c283 |
{
|
|
|
88c283 |
MetaWorkspaceManager *workspace_manager = window->display->workspace_manager;
|
|
|
88c283 |
gboolean allow_workspace_switch;
|
|
|
88c283 |
+
|
|
|
88c283 |
+ if (window->unmanaging)
|
|
|
88c283 |
+ {
|
|
|
88c283 |
+ g_warning ("Trying to activate unmanaged window '%s'", window->desc);
|
|
|
88c283 |
+ return;
|
|
|
88c283 |
+ }
|
|
|
88c283 |
+
|
|
|
88c283 |
meta_topic (META_DEBUG_FOCUS,
|
|
|
88c283 |
"_NET_ACTIVE_WINDOW message sent for %s at time %u "
|
|
|
88c283 |
"by client type %u.\n",
|
|
|
88c283 |
--
|
|
|
88c283 |
2.21.0
|
|
|
88c283 |
|