Don't broadcast CHANCREATE snotice if channel is +P, fixes second half of bug #565...

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

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 90d25e0604eaea1d5e392c364487d620e583a423..0e3a1ee5f00ee965c391b4cdf05f6a0e8e39c4b6 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -229,7 +229,7 @@ void SocketEngine::RecoverFromFork()
 
 void SocketEngine::UpdateStats(size_t len_in, size_t len_out)
 {
-       if (lastempty + 1 > time(NULL))
+       if (lastempty != time(NULL))
        {
                lastempty = time(NULL);
                indata = outdata = 0;
@@ -240,9 +240,10 @@ void SocketEngine::UpdateStats(size_t len_in, size_t len_out)
 
 void SocketEngine::GetStats(float &kbitpersec_in, float &kbitpersec_out, float &kbitpersec_total)
 {
+       UpdateStats(0, 0); /* Forces emptying of the values if its been more than a second */
        float in_kbit = indata * 8;
        float out_kbit = outdata * 8;
-       kbitpersec_total = ((in_kbit + out_kbit)) / 1024);
+       kbitpersec_total = ((in_kbit + out_kbit) / 1024);
        kbitpersec_in = in_kbit / 1024;
        kbitpersec_out = out_kbit / 1024;
 }