X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;h=a461d262e987ea8f34b6cd5fc50ca46fd01c98c0;hp=163f220d6c4b30ad72a9736a30b6a941b2e4a032;hb=90ee8b5c90923a3d4a48fc5493ca999e9d0d6a97;hpb=6ac855b96988ebc999f7017765ae3dbda527301a

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index 163f220d..a461d262 100644
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -280,6 +280,11 @@ void NetworkConnection::disconnectFromIrc(bool requested) {
 void NetworkConnection::socketHasData() {
   while(socket.canReadLine()) {
     QByteArray s = socket.readLine().trimmed();
+    // FIXME debug
+    if(Global::SPUTDEV && s == lastMsgReceived) {
+      qWarning() << "NetworkConnection::socketHasData(): Message repeated! -> loop?";
+    }
+    lastMsgReceived = s;
     ircServerHandler()->handleServerMsg(s);
   }
 }
@@ -347,6 +352,10 @@ void NetworkConnection::socketInitialized() {
     disconnectFromIrc();
     return;
   }
+  QString passwd = network()->serverList()[_lastUsedServerlistIndex].toMap()["Password"].toString();
+  if(!passwd.isEmpty()) {
+    putRawLine(serverEncode(QString("PASS %1").arg(passwd)));
+  }
   putRawLine(serverEncode(QString("NICK :%1").arg(identity->nicks()[0])));  // FIXME: try more nicks if error occurs
   putRawLine(serverEncode(QString("USER %1 8 * :%2").arg(identity->ident(), identity->realName())));
 }