Merge guestpattern fix by peaveydk

[user/henk/code/inspircd.git] / src / userprocess.cpp

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 7bc287265ebf8bf73c7f15e93d5170916acd4a82..cb204989d7a45595763e28c8f1ffac6ae9d6697d 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -294,8 +294,8 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                if (!curr->lastping)
                                {
                                        /* Everybody loves boobies. */
-                                       std::string time = ConvToStr(this->Time() - (curr->nping - curr->pingmax));
-                                       std::string boobies = "Ping timeout: " + time + " second(s)"; 
+                                       time_t time = this->Time() - (curr->nping - curr->pingmax);
+                                       std::string boobies = "Ping timeout: " + ConvToStr(time) + " second" + (time > 1 ? "s" : ""); 
                                        GlobalGoners.AddItem(curr, boobies);
                                        curr->lastping = 1;
                                        curr->nping = TIME+curr->pingmax;