From 0988e211931344e54dc64dc66d0aedbda7f5b4f5 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 19 Nov 2015 15:52:01 -0500 Subject: [PATCH] ensure that a deskmirror object does not orphan child objects ref T2846, T2830 --- src/bin/e_deskmirror.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bin/e_deskmirror.c b/src/bin/e_deskmirror.c index 216f4515d..b9017fbae 100644 --- a/src/bin/e_deskmirror.c +++ b/src/bin/e_deskmirror.c @@ -567,9 +567,13 @@ _comp_object_check(Mirror *m) evas_object_geometry_get(m->comp_object, NULL, NULL, &w, &h); if ((w < 2) || (h < 2)) return EINA_FALSE; - m->mirror = e_comp_object_util_mirror_add(m->comp_object); - if (!m->mirror) return EINA_FALSE; + if (!m->mirror) + { + m->mirror = e_comp_object_util_mirror_add(m->comp_object); + if (!m->mirror) return EINA_FALSE; + } evas_object_smart_callback_del(m->comp_object, "dirty", _comp_object_dirty); + if (m->added) return EINA_TRUE; evas_object_name_set(m->mirror, "m->mirror"); _e_deskmirror_mirror_setup(m); return EINA_TRUE;