X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=34573d9b76cd36e57cc2347df8b9baee3e652e67;hp=bcdcf446630fe5003a1412319c8c86925a218c51;hb=f4693532403c2bcba592d322d0b5dbceaf76e758;hpb=bb799766223a6388e476f320ad74720c802b2d83

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index bcdcf446..34573d9b 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -94,6 +94,9 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) {
     params.removeFirst();
   }
 
+  // note that the IRC server is still alive
+  network()->resetPingTimeout();
+
   // Now we try to find a handler for this message. BTW, I do love the Trolltech guys ;-)
   handle(cmd, Q_ARG(QString, prefix), Q_ARG(QList<QByteArray>, params));
 }
@@ -385,8 +388,6 @@ void IrcServerHandler::handlePong(const QString &prefix, const QList<QByteArray>
   if(params.count() < 2)
     return;
 
-  network()->resetPong();
-
   QString timestamp = serverDecode(params[1]);
   QTime sendTime = QTime::fromString(timestamp, "hh:mm:ss.zzz");
   if(!sendTime.isValid()) {