From d7a8f558dfd03763e1c7e2ee5267977307bee421 Mon Sep 17 00:00:00 2001
From: "simon.kagstrom" <simon.kagstrom@feb19cf6-d755-11dd-8179-53c65a4d6d95>
Date: Sat, 30 Jan 2010 16:59:46 +0000
Subject: [PATCH] Disarm before tick (can be deleted in tick)

---
 Src/timer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/timer.cpp b/Src/timer.cpp
index 581a07f..588fa8d 100644
--- a/Src/timer.cpp
+++ b/Src/timer.cpp
@@ -63,8 +63,8 @@ void TimerController::tick()
 		if (!cur)
 			continue;
 
-		cur->tick();
 		if (cur->timeout == 0)
 			this->disarm(cur);
+		cur->tick();
 	}
 }