Merge the latest changes from insp20 into master.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index bc0875502..47660f752 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -642,8 +642,15 @@ void InspIRCd::Run()
 			OLDTIME = TIME.tv_sec;
 
 			if ((TIME.tv_sec % 3600) == 0)
+			{
 				FOREACH_MOD(OnGarbageCollect, ());
 
+				// HACK: ELines are not expired properly at the moment but it can't be fixed as
+				// the 2.0 XLine system is a spaghetti nightmare. Instead we skip over expired
+				// ELines in XLineManager::CheckELines() and expire them here instead.
+				XLines->GetAll("E");
+			}
+
 			Timers.TickTimers(TIME.tv_sec);
 			Users->DoBackgroundUserStuff();