From 81f962da7512703e3f6b0e0d1757da0a1f839be1 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 2 Mar 2021 13:11:35 +0000 Subject: [PATCH] efl ui format - only sety format fun to null if format func free exists --- src/lib/elementary/efl_ui_format.c | 5 ++++- src/lib/elementary/elm_slider.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/lib/elementary/efl_ui_format.c b/src/lib/elementary/efl_ui_format.c index 1a2af7345e..eef6c4e2df 100644 --- a/src/lib/elementary/efl_ui_format.c +++ b/src/lib/elementary/efl_ui_format.c @@ -336,7 +336,10 @@ _efl_ui_format_decimal_places_get(Eo *obj EINA_UNUSED, Efl_Ui_Format_Data *pd) EOLIAN static void _efl_ui_format_efl_object_destructor(Eo *obj, Efl_Ui_Format_Data *pd EINA_UNUSED) { - efl_ui_format_func_set(obj, NULL, NULL, NULL); + if (pd->format_func_free) + { + efl_ui_format_func_set(obj, NULL, NULL, NULL); + } efl_ui_format_values_set(obj, NULL); efl_ui_format_string_set(obj, NULL, 0); efl_destructor(efl_super(obj, EFL_UI_FORMAT_MIXIN)); diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c index 31c9bcdfcc..e5bd17711b 100644 --- a/src/lib/elementary/elm_slider.c +++ b/src/lib/elementary/elm_slider.c @@ -1270,9 +1270,9 @@ _elm_slider_efl_ui_format_format_cb_set(Eo *obj, Elm_Slider_Data *sd, void *func if (sd->format_cb_data && sd->format_free_cb) sd->format_free_cb(sd->format_cb_data); - sd->format_cb = NULL; - sd->format_cb_data = NULL; - sd->format_free_cb = NULL; +// sd->format_cb = NULL; +// sd->format_cb_data = NULL; +// sd->format_free_cb = NULL; if (efl_invalidated_get(obj)) return;