jackdanielz pushed a commit to branch master.

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

commit 2e5b0acf1932367aa74caf24a3de41aa44cd0b88
Author: Daniel Zaoui <daniel.za...@samsung.com>
Date:   Tue Nov 10 16:08:06 2015 +0200

    Generator: fix JSON generation for tables
    
    Scenario: create a table, delete the dummies and save
    Result: dummy settings are still in the table configuration
    
    The widget existence was not verified, leading to the generation of the
    dummies.
---
 src/lib/json_generator.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/json_generator.c b/src/lib/json_generator.c
index 0202ba7..d319f83 100644
--- a/src/lib/json_generator.c
+++ b/src/lib/json_generator.c
@@ -521,6 +521,9 @@ _widget_json_generate(const Gui_Widget *wdg, Gui_Session 
*session, Eina_Json_Val
              Object_Container_Item *ci;
              EINA_LIST_FOREACH(items_lst, itr, ci)
                {
+                  Eid *eid = obj_container_item_eid_get(ci);
+                  Gui_Widget *ci_wdg = wdg_get(eid);
+                  if (!ci_wdg) continue;
                   prop = obj_container_item_prop_get(ci);
                   Gui_Value *val;
                   Eina_Json_Value *arr = eina_json_array_new();
@@ -533,7 +536,7 @@ _widget_json_generate(const Gui_Widget *wdg, Gui_Session 
*session, Eina_Json_Val
                        /* First object in table's item values_lst is content's 
name. */
                        if (values_lst == itr2)
                          {
-                            Eid *eid = EID_ID_GET(val);
+                            eid = EID_ID_GET(val);
                             if (eid)
                               {
                                  if (eid_is_dummy(eid)) item_name = "__dummy";

-- 


Reply via email to