From 45938e3b486900c098cf32eb359a2c5f8506eea4 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Fri, 20 Aug 2021 12:17:06 +0100
Subject: [PATCH] e - fix dont blank with fs windows when a fs window exits

---
 src/bin/e_comp_object.c | 11 +++++++++++
 src/bin/e_dpms.c        |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index f0747c89f..ffbe1988e 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1610,6 +1610,11 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
 {
    E_Comp_Object *cw = data;
 
+   if (cw->ec->fullscreen)
+     {
+        cw->ec->desk->fullscreen_clients =
+          eina_list_remove(cw->ec->desk->fullscreen_clients, cw->ec);
+     }
    if (cw->ec->hidden)
      {
         /* hidden flag = just do it */
@@ -1661,6 +1666,12 @@ _e_comp_intercept_show_helper(E_Comp_Object *cw)
 {
    int w = 0, h = 0;
 
+   if (cw->ec->fullscreen)
+     {
+        if (!eina_list_data_find(cw->ec->desk->fullscreen_clients, cw->ec))
+          cw->ec->desk->fullscreen_clients =
+            eina_list_append(cw->ec->desk->fullscreen_clients, cw->ec);
+     }
    if (cw->ec->sticky)
      e_comp_object_signal_emit(cw->smart_obj, "e,state,sticky", "e");
    if (cw->visible)
diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c
index 93b021676..33f394665 100644
--- a/src/bin/e_dpms.c
+++ b/src/bin/e_dpms.c
@@ -33,7 +33,7 @@ e_dpms_update(void)
    Eina_Bool changed = EINA_FALSE;
 
    enabled = ((e_config->screensaver_enable) &&
-              (!((e_util_fullscreen_current_any()) &&
+              (!((e_util_fullscreen_any()) &&
                  (e_config->no_dpms_on_fullscreen))));
    if (_e_dpms_enabled != enabled)
      {