From 45f807bf3a812120e606026546f5f282fb17ac39 Mon Sep 17 00:00:00 2001 From: Junghoon Park Date: Tue, 10 Oct 2017 22:14:17 +0900 Subject: [PATCH] Fix crash issue - Wrong sequence of finishing classes Change-Id: Icc9b23762f1a274ee1e8c7b1612280d934fb4599 Signed-off-by: Junghoon Park --- src/base/widget_base.c | 3 +-- src/efl_base/widget_app.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/base/widget_base.c b/src/base/widget_base.c index 1843061..f37fa3f 100644 --- a/src/base/widget_base.c +++ b/src/base/widget_base.c @@ -1249,10 +1249,9 @@ static void __free_class(gpointer data) EXPORT_API void widget_base_fini(void) { + appcore_multiwindow_base_fini(); g_list_free_full(__context.classes, __free_class); __context.classes = NULL; - - appcore_multiwindow_base_fini(); } EXPORT_API int widget_base_context_window_bind( diff --git a/src/efl_base/widget_app.c b/src/efl_base/widget_app.c index 6197b31..83073b3 100644 --- a/src/efl_base/widget_app.c +++ b/src/efl_base/widget_app.c @@ -262,13 +262,13 @@ EXPORT_API int widget_app_main(int argc, char **argv, cb_info.user_data = user_data; r = widget_base_init(ops, argc, argv, &cb_info); + widget_base_fini(); + if (__class_data_list) { g_list_free_full(__class_data_list, free); __class_data_list = NULL; } - widget_base_fini(); - return r; } -- 2.7.4