X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=8e667380e3633d5bf65962ecde9b359e47adc3fb;hp=e974c21677a7df18a015a39590925898ba928d62;hb=9d12f8189a0dfd8ac76e41aea86ac56bdf907fde;hpb=8de2d4650197bdae2f39f804228f3bce5ddbd59c

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index e974c216..8e667380 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -292,14 +292,8 @@ void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) {
 void CoreSession::recvMessageFromServer(Message::Type type, QString target, QString text, QString sender, quint8 flags) {
   NetworkConnection *netCon = qobject_cast<NetworkConnection*>(this->sender());
   Q_ASSERT(netCon);
-
-  QString bufferName;
-  if((flags & Message::PrivMsg) && !(flags & Message::Self))
-    bufferName = nickFromMask(sender);
-  else
-    bufferName = target;
-
-  BufferInfo bufferInfo = Core::bufferInfo(user(), netCon->networkId(), bufferName);
+  
+  BufferInfo bufferInfo = Core::bufferInfo(user(), netCon->networkId(), target);
   Message msg(bufferInfo, type, text, sender, flags);
   msg.setMsgId(Core::storeMessage(msg));
   Q_ASSERT(msg.msgId() != 0);