yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=f7c9c69072ebdacbcdb3613c67b72b5b7012497b

commit f7c9c69072ebdacbcdb3613c67b72b5b7012497b
Author: Yakov Goldberg <yako...@samsung.com>
Date:   Sun Feb 8 15:18:55 2015 +0200

    Fix parent set when unsetting obj containers
---
 src/lib/gui_widget.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/gui_widget.c b/src/lib/gui_widget.c
index a3adeae..92c1104 100644
--- a/src/lib/gui_widget.c
+++ b/src/lib/gui_widget.c
@@ -1673,7 +1673,9 @@ wdg_obj_container_unset(Gui_Widget *wdg)
         Eid *eid = obj_container_item_eid_get(ci);
         Gui_Widget *w = NULL;
         if (eid) w = wdg_get(eid);
-        if (w)
+        /* Change widget's parent only if current parent is this container.
+         * If not, it means that parent was already changed. */
+        if (w && (wdg == wdg_parent_get(w)))
           {
              const Gui_Widget *parent_win = wdg_main_wdg_get(w);
              wdg_parent_set(w, wdg_name_get(parent_win));

-- 


Reply via email to