Fix the bugs about using ecore timer.

There is the case that ecore timer is double freed. Then the bugs is fixed.
 ecore.c:562 _ecore_magic_fail()   Input handle has already been freed!

Change-Id: I9287292affc66579f2a79800c09692cc0fc12b55
Signed-off-by: Krzysztof Sasiak <k.sasiak@samsung.com>

diff --git a/src/display/battery.c b/src/display/battery.c
index a9d6eb4..2ae9a75 100644 (file)
--- a/src/display/battery.c
+++ b/src/display/battery.c
@@ -412,7 +412,7 @@ void end_battinfo_gathering(void)
 {
        _I("End battery gathering!");
 
-       if (!timeout_id) {
+       if (timeout_id) {
                ecore_timer_del(timeout_id);
                timeout_id = NULL;
        }

diff --git a/src/display/core.c b/src/display/core.c
index ff51681..7ca0e2a 100644 (file)
--- a/src/display/core.c
+++ b/src/display/core.c
@@ -551,6 +551,7 @@ int delete_condition(enum state_t state)
        while (t != NULL) {
                if (t->timeout_id > 0) {
                        ecore_timer_del(t->timeout_id);
+                       t->timeout_id = NULL;
                }
                tmp = t;
                t = t->next;