discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=0988e211931344e54dc64dc66d0aedbda7f5b4f5

commit 0988e211931344e54dc64dc66d0aedbda7f5b4f5
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Nov 19 15:52:01 2015 -0500

    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 216f451..b9017fb 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;

-- 


Reply via email to