summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2014-10-27 15:32:20 +0200
committerYakov Goldberg <yakov.g@samsung.com>2014-10-27 15:32:32 +0200
commitacf201f2256a4bdb8a97ec661f032d8a1dc78287 (patch)
treef49af5359cd70425a76806f512838a068bfbf147
parentf13169620cda7b17ce0a61e5f9b929e78f624a21 (diff)
Fix segv introduced in prev commit
-rw-r--r--src/bin/egui_gui/contentview.c1
-rw-r--r--src/bin/egui_gui/editor.c3
-rw-r--r--src/bin/egui_gui/itemview.c1
-rw-r--r--src/bin/egui_gui/prop_layout.c1
-rw-r--r--src/bin/egui_gui/propview.c1
5 files changed, 3 insertions, 4 deletions
diff --git a/src/bin/egui_gui/contentview.c b/src/bin/egui_gui/contentview.c
index d57e21d..4a41a93 100644
--- a/src/bin/egui_gui/contentview.c
+++ b/src/bin/egui_gui/contentview.c
@@ -268,7 +268,6 @@ contentview_shutdown(void)
268 elm_genlist_item_class_free(_itc_ctn); 268 elm_genlist_item_class_free(_itc_ctn);
269 _itc_ctn = NULL; 269 _itc_ctn = NULL;
270 270
271 free(_contentview_cbs);
272 eo_do(ctn_list, elm_obj_genlist_clear()); 271 eo_do(ctn_list, elm_obj_genlist_clear());
273 ctn_list = NULL; 272 ctn_list = NULL;
274} 273}
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index 6983684..dfbbbe0 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -1752,7 +1752,6 @@ editor_shutdown()
1752 target_db_shutdown(); 1752 target_db_shutdown();
1753 seqview_shutdown(); 1753 seqview_shutdown();
1754 proplayout_shutdown(); 1754 proplayout_shutdown();
1755 itemview_shutdown();
1756 objtree_list_unset(); 1755 objtree_list_unset();
1757 1756
1758 void *p = (void *) propview_cbs_get(); 1757 void *p = (void *) propview_cbs_get();
@@ -1763,6 +1762,8 @@ editor_shutdown()
1763 free(p); 1762 free(p);
1764 p = (void *) itemview_cbs_get(); 1763 p = (void *) itemview_cbs_get();
1765 free(p); 1764 free(p);
1765 p = (void *) contentview_cbs_get();
1766 free(p);
1766} 1767}
1767 1768
1768static void 1769static void
diff --git a/src/bin/egui_gui/itemview.c b/src/bin/egui_gui/itemview.c
index 669da6b..6ee71c0 100644
--- a/src/bin/egui_gui/itemview.c
+++ b/src/bin/egui_gui/itemview.c
@@ -213,7 +213,6 @@ itemview_shutdown()
213 elm_genlist_item_class_free(_item_itc); 213 elm_genlist_item_class_free(_item_itc);
214 _item_itc = NULL; 214 _item_itc = NULL;
215 } 215 }
216 free(_view_cbs);
217} 216}
218 217
219void 218void
diff --git a/src/bin/egui_gui/prop_layout.c b/src/bin/egui_gui/prop_layout.c
index 687b456..9efe2a8 100644
--- a/src/bin/egui_gui/prop_layout.c
+++ b/src/bin/egui_gui/prop_layout.c
@@ -328,6 +328,7 @@ proplayout_shutdown()
328 descview_shutdown(); 328 descview_shutdown();
329 contentview_shutdown(); 329 contentview_shutdown();
330 propview_shutdown(); 330 propview_shutdown();
331 itemview_shutdown();
331 332
332 _mempool_cache_free(); 333 _mempool_cache_free();
333} 334}
diff --git a/src/bin/egui_gui/propview.c b/src/bin/egui_gui/propview.c
index 9ed80dc..0e0d186 100644
--- a/src/bin/egui_gui/propview.c
+++ b/src/bin/egui_gui/propview.c
@@ -443,7 +443,6 @@ propview_shutdown()
443 eo_do(prop_list, elm_obj_genlist_clear()); 443 eo_do(prop_list, elm_obj_genlist_clear());
444 prop_list = NULL; 444 prop_list = NULL;
445 445
446 free(_view_cbs);
447 eina_hash_free(op_item_table); 446 eina_hash_free(op_item_table);
448 eina_hash_free(expanded_classes); 447 eina_hash_free(expanded_classes);
449} 448}