Cleanup of various different crashes/inconsistancies

1 files changed, 3 insertions, 4 deletions

diff --git a/src/operserv.cpp b/src/operserv.cpp
index fd345cb8c..0582e91ee 100644
--- a/src/operserv.cpp
+++ b/src/operserv.cpp
@@ -407,16 +407,15 @@ XLine *XLineManager::Check(User *u)
 {
 	const time_t now = time(NULL);
 
-	for (std::vector<XLine *>::iterator it = this->XLines.begin(), it_end = this->XLines.end(); it != it_end; ++it)
+	for (unsigned i = this->XLines.size(); i > 0; --i)
 	{
-		XLine *x = *it;
+		XLine *x = this->XLines[i - 1];
 
 		if (x->Expires && x->Expires < now)
 		{
 			OnExpire(x);
 			delete x;
-			it = XLines.erase(it);
-			--it;
+			this->XLines.erase(XLines.begin() + i - 1);
 			continue;
 		}