X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=69c31f8400898caacd9d2b1f01090aa1ac4f9f82;hb=4c751dbbe8945e5efc230a59b0ed51c2ba10cf92;hp=fe90e238101a3c5c2e7e0347bd658df1dbeb7bf7;hpb=3db020ca0ba7d5dc797c07885b1d9f80def2b00d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index fe90e2381..69c31f840 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -104,10 +104,15 @@ void InspIRCd::DoBackgroundUserStuff()
 					curr->FullConnect();
 					continue;
 				}
+
+				// If the user has been quit in OnCheckReady then we shouldn't
+				// quit them again for having a registration timeout.
+				if (curr->quitting)
+					continue;
 				break;
 		}
 
-		if (curr->registered != REG_ALL && (Time() >= (curr->age + curr->MyClass->GetRegTimeout())))
+		if (curr->registered != REG_ALL && curr->MyClass && (Time() > (curr->signon + curr->MyClass->GetRegTimeout())))
 		{
 			/*
 			 * registration timeout -- didnt send USER/NICK/HOST