From fb4c9aec1ac2ecbf5fa25281c207fb1493673436 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan@xfce.org>
Date: Sun, 11 Oct 2020 20:56:39 +0200
Subject: [PATCH] compositor: No hashtable if compositor is disabled
When the compositor is disabled on a given screen, there is no point in
looking for XID in the hash table.
That fixes errors like:
g_hash_table_lookup: assertion 'hash_table != NULL' failed
When the compositor is disabled.
Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
---
src/compositor.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/compositor.c b/src/compositor.c
index 3b224dd40..a51596c80 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -181,6 +181,12 @@ find_cwindow_in_display (DisplayInfo *display_info, Window id)
for (list = display_info->screens; list; list = g_slist_next (list))
{
ScreenInfo *screen_info = (ScreenInfo *) list->data;
+
+ if (!compositorIsActive (screen_info))
+ {
+ continue;
+ }
+
CWindow *cw = find_cwindow_in_screen (screen_info, id);
if (cw)
{
@@ -3995,6 +4001,7 @@ compositorIsUsable (DisplayInfo *display_info)
TRACE ("compositor not set to manual redirect mode");
return FALSE;
}
+
return TRUE;
#endif /* HAVE_COMPOSITOR */
return FALSE;
--
GitLab