Implement check for empty quit message, fixing BR #31.

[quassel.git] / core / server.cpp

diff --git a/core/server.cpp b/core/server.cpp
index 01cf281..44b85b4 100644 (file)
--- a/core/server.cpp
+++ b/core/server.cpp
@@ -697,8 +697,10 @@ void Server::handleServerQuit(QString prefix, QStringList params) {
   QString nick = updateNickFromMask(prefix);
   Q_ASSERT(nicks.contains(nick));
   VarMap chans = nicks[nick]["Channels"].toMap();
+  QString msg;
+  if(params.count()) msg = params[0];
   foreach(QString c, chans.keys()) {
-    emit displayMsg(Message::Quit, c, params[0], prefix);
+    emit displayMsg(Message::Quit, c, msg, prefix);
   }
   nicks.remove(nick);
   emit nickRemoved(network, nick);
@@ -866,7 +868,7 @@ void Server::handleCtcpAction(CtcpType ctcptype, QString prefix, QString target,
 
 void Server::handleCtcpPing(CtcpType ctcptype, QString prefix, QString target, QString param) {
   if(ctcptype == CtcpQuery) {
-    ctcpReply(userFromMask(prefix), "PING", param);
+    ctcpReply(nickFromMask(prefix), "PING", param);
     emit displayMsg(Message::Plain, "", tr("Received CTCP PING request by %1").arg(prefix));
   } else {
     // display ping answer
@@ -875,8 +877,8 @@ void Server::handleCtcpPing(CtcpType ctcptype, QString prefix, QString target, Q
 
 void Server::handleCtcpVersion(CtcpType ctcptype, QString prefix, QString target, QString param) {
   if(ctcptype == CtcpQuery) {
-    // FIXME use real Info about quasel :)
-    ctcpReply(userFromMask(prefix), "VERSION", QString("Quassel:pre Release:*nix"));
+    // FIXME use real Info about quassel :)
+    ctcpReply(nickFromMask(prefix), "VERSION", QString("Quassel:pre Release:*nix"));
     emit displayMsg(Message::Plain, "", tr("Received CTCP VERSION request by %1").arg(prefix));
   } else {
     // TODO display Version answer