summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-03-02 13:11:35 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-03-02 13:11:35 +0000
commit81f962da7512703e3f6b0e0d1757da0a1f839be1 (patch)
tree52d9b69157f979a282ae9e1be8ae18415ea0303b /src/lib
parent67acb15a1fc1e3ff60417f482e4453e5d4f73235 (diff)
efl ui format - only sety format fun to null if format func free exists
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/efl_ui_format.c5
-rw-r--r--src/lib/elementary/elm_slider.c6
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)
336EOLIAN static void 336EOLIAN static void
337_efl_ui_format_efl_object_destructor(Eo *obj, Efl_Ui_Format_Data *pd EINA_UNUSED) 337_efl_ui_format_efl_object_destructor(Eo *obj, Efl_Ui_Format_Data *pd EINA_UNUSED)
338{ 338{
339 efl_ui_format_func_set(obj, NULL, NULL, NULL); 339 if (pd->format_func_free)
340 {
341 efl_ui_format_func_set(obj, NULL, NULL, NULL);
342 }
340 efl_ui_format_values_set(obj, NULL); 343 efl_ui_format_values_set(obj, NULL);
341 efl_ui_format_string_set(obj, NULL, 0); 344 efl_ui_format_string_set(obj, NULL, 0);
342 efl_destructor(efl_super(obj, EFL_UI_FORMAT_MIXIN)); 345 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
1270 1270
1271 if (sd->format_cb_data && sd->format_free_cb) 1271 if (sd->format_cb_data && sd->format_free_cb)
1272 sd->format_free_cb(sd->format_cb_data); 1272 sd->format_free_cb(sd->format_cb_data);
1273 sd->format_cb = NULL; 1273// sd->format_cb = NULL;
1274 sd->format_cb_data = NULL; 1274// sd->format_cb_data = NULL;
1275 sd->format_free_cb = NULL; 1275// sd->format_free_cb = NULL;
1276 1276
1277 if (efl_invalidated_get(obj)) return; 1277 if (efl_invalidated_get(obj)) return;
1278 1278