From 04c63131147e7ea834a848922637451a1e004fb8 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 14 Jul 2016 08:55:03 +0900 Subject: [PATCH] ecore - add more ecore main loop checks that were missing in some places so 1 ecore_exe func was missing a main loop check... just to be sure. --- src/lib/ecore/ecore_exe.c | 1 + src/lib/ecore/ecore_timer.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c index 3063b79..28ffa9f 100644 --- a/src/lib/ecore/ecore_exe.c +++ b/src/lib/ecore/ecore_exe.c @@ -67,6 +67,7 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data) { + EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); Ecore_Exe *ret = eo_add(MY_CLASS, NULL, ecore_obj_exe_command_set(eo_self, exe_cmd, flags)); if (ret) { diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index 2d9e1bc..20f94f8 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -184,6 +184,7 @@ ecore_timer_add(double in, Ecore_Timer_Legacy *legacy; Eo *timer; + EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); legacy = calloc(1, sizeof (Ecore_Timer_Legacy)); if (!legacy) return NULL; @@ -205,6 +206,7 @@ ecore_timer_loop_add(double in, Ecore_Timer_Legacy *legacy; Eo *timer; + EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); legacy = calloc(1, sizeof (Ecore_Timer_Legacy)); if (!legacy) return NULL; @@ -342,6 +344,7 @@ _efl_loop_timer_pending_get(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer) EAPI void ecore_timer_freeze(Ecore_Timer *timer) { + EINA_MAIN_LOOP_CHECK_RETURN; ECORE_TIMER_CHECK(timer); eo_event_freeze(timer); } @@ -373,6 +376,7 @@ ecore_timer_freeze_get(Ecore_Timer *timer) { int r = 0; + EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE); r = eo_event_freeze_count_get(timer); return !!r; } @@ -388,6 +392,7 @@ _efl_loop_timer_eo_base_event_freeze_count_get(Eo *obj EINA_UNUSED, Efl_Loop_Tim EAPI void ecore_timer_thaw(Ecore_Timer *timer) { + EINA_MAIN_LOOP_CHECK_RETURN; ECORE_TIMER_CHECK(timer); eo_event_thaw(timer); } -- 2.7.4