summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeandro Dorileo <dorileo@profusion.mobi>2012-12-11 21:13:17 +0000
committerLeandro Dorileo <dorileo@profusion.mobi>2012-12-11 21:13:17 +0000
commita0318bb829e1041a345e403461d5c74a00a2f866 (patch)
treed51e5673643f17a15a93e18b5c16dfbad3818b1f
parentd2112a206edca777ec8fe3cf6bd1cdb28620d7cb (diff)
efbb: unfreeze timer before deleting it
Before deleting the game timer unfreeze it so ecore doesn't try to handle as pending a deleted timer. SVN revision: 80724
-rw-r--r--src/bin/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bin/main.c b/src/bin/main.c
index 4a078ba..ca21541 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -708,6 +708,7 @@ level_unload(Game *game)
708 708
709 if (game->timer) 709 if (game->timer)
710 { 710 {
711 ecore_timer_thaw(game->timer);
711 ecore_timer_del(game->timer); 712 ecore_timer_del(game->timer);
712 game->timer = NULL; 713 game->timer = NULL;
713 } 714 }
@@ -968,6 +969,8 @@ _ship_time_attack_cb(void *data)
968 int x, y, z, w, h, d; 969 int x, y, z, w, h, d;
969 Eina_List *l; 970 Eina_List *l;
970 971
972 if (!game->timer) return EINA_FALSE;
973
971 ephysics_body_geometry_get(game->ship, &x, &y, &z, &w, &h, &d); 974 ephysics_body_geometry_get(game->ship, &x, &y, &z, &w, &h, &d);
972 975
973 if (x >= 2260) 976 if (x >= 2260)