From 16a017942e0738983c5d897c2332829549838f3e Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Wed, 30 Nov 2016 19:43:46 +0900 Subject: [PATCH] Reset pre-initialized object to null pointer Change-Id: I27d3ff1c875189d17fae7cc167daf0ef005abd84 Signed-off-by: Hwankyu Jhun --- src/app_resource.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/src/app_resource.c b/src/app_resource.c index 374472b..ff36edc 100644 --- a/src/app_resource.c +++ b/src/app_resource.c @@ -30,20 +30,41 @@ void *app_get_preinitialized_window(const char *win_name) { - if (elm_win_precreated_object_get() == NULL) + void *win; + + win = elm_win_precreated_object_get(); + if (win == NULL) return NULL; appcore_set_preinit_window_name(win_name); - return elm_win_precreated_object_get(); + elm_win_precreated_object_set(NULL); + + return win; } void *app_get_preinitialized_background(void) { - return elm_bg_precreated_object_get(); + void *background; + + background = elm_bg_precreated_object_get(); + if (background == NULL) + return NULL; + + elm_bg_precreated_object_set(NULL); + + return background; } void *app_get_preinitialized_conformant(void) { - return elm_conformant_precreated_object_get(); + void *conformant; + + conformant = elm_conformant_precreated_object_get(); + if (conformant == NULL) + return NULL; + + elm_conformant_precreated_object_set(NULL); + + return conformant; } -- 2.7.4