From e7cfd0667598d0213b2425ef7b9cd60ac666df69 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Mon, 6 Nov 2017 13:58:16 -0500
Subject: [PATCH] avoid performing client rescales during shutdown

---
 src/bin/e_client.c | 2 ++
 src/bin/e_comp.c   | 1 +
 src/bin/e_zone.c   | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 7c68bc407..6ea96054c 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3331,6 +3331,8 @@ e_client_rescale(E_Client *ec)
 {
    Eina_Bool shaded;
    int shade_dir;
+
+   if (stopping) return;
    E_OBJECT_CHECK(ec);
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 650e4a978..42a47736c 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1813,6 +1813,7 @@ e_comp_clients_rescale(void)
 {
    int i;
 
+   if (stopping) return;
    for (i = 0; i < 11; i++)
      {
         Eina_List *tmp = NULL;
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 4a24ed540..0d769b876 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -1312,7 +1312,8 @@ e_zone_useful_geometry_dirty(E_Zone *zone)
    e_object_ref(E_OBJECT(ev->zone));
    ecore_event_add(E_EVENT_ZONE_USEFUL_GEOMETRY_CHANGED, ev, _e_zone_event_generic_free, NULL);
 
-   e_comp_clients_rescale();
+   if (!stopping)
+     e_comp_clients_rescale();
 }
 
 E_API E_Zone_Obstacle *