summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-11-19 15:52:01 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-11-19 15:52:01 -0500
commit0988e211931344e54dc64dc66d0aedbda7f5b4f5 (patch)
tree649c42ce9e909d5822e44f752e07b108ce8bec31
parent818531a13e287138ddeb5274b805d108b0bd6ede (diff)
ensure that a deskmirror object does not orphan child objects
ref T2846, T2830
-rw-r--r--src/bin/e_deskmirror.c8
1 files 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)
567 567
568 evas_object_geometry_get(m->comp_object, NULL, NULL, &w, &h); 568 evas_object_geometry_get(m->comp_object, NULL, NULL, &w, &h);
569 if ((w < 2) || (h < 2)) return EINA_FALSE; 569 if ((w < 2) || (h < 2)) return EINA_FALSE;
570 m->mirror = e_comp_object_util_mirror_add(m->comp_object); 570 if (!m->mirror)
571 if (!m->mirror) return EINA_FALSE; 571 {
572 m->mirror = e_comp_object_util_mirror_add(m->comp_object);
573 if (!m->mirror) return EINA_FALSE;
574 }
572 evas_object_smart_callback_del(m->comp_object, "dirty", _comp_object_dirty); 575 evas_object_smart_callback_del(m->comp_object, "dirty", _comp_object_dirty);
576 if (m->added) return EINA_TRUE;
573 evas_object_name_set(m->mirror, "m->mirror"); 577 evas_object_name_set(m->mirror, "m->mirror");
574 _e_deskmirror_mirror_setup(m); 578 _e_deskmirror_mirror_setup(m);
575 return EINA_TRUE; 579 return EINA_TRUE;