X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=ee30ba4e9e9c7951f469ba22a3227b7a0868f00a;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=6e8040d871ae98d74e9ddf6b409fb924c634a6b7;hpb=7907a1f1cc78ca532547c824cd221060b57f4fff;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 6e8040d87..ee30ba4e9 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -57,7 +57,6 @@ using namespace std;
 #include "socket.h"
 #include "typedefs.h"
 #include "command_parse.h"
-#include "timer.h"
 
 InspIRCd* ServerInstance;
 
@@ -642,6 +641,7 @@ int InspIRCd::Run()
 		{
 			expire_lines();
 			FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME));
+			TickMissedTimers(TIME);
 			expire_run = true;
 			continue;
 		}
@@ -660,7 +660,6 @@ int InspIRCd::Run()
 			/*
 			 * Trigger all InspTimers that are pending
 			 */
-			TickTimers(TIME);
 		}
 
 		/* Process timeouts on module sockets each time around
@@ -670,6 +669,8 @@ int InspIRCd::Run()
 		 */
 		DoSocketTimeouts(TIME);
 
+		TickTimers(TIME);
+
 		/* Call the socket engine to wait on the active
 		 * file descriptors. The socket engine has everything's
 		 * descriptors in its list... dns, modules, users,