X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=9f24007ab79d68b58ee790eba363c18d0ed93d48;hb=32023e27e875eede980d7323c1d05b5d4cc795d8;hp=a33b942ce868b5519c5de10d8fb811aa6857b7b2;hpb=3eebe11329417e77038d860af3b6f35630f40450;p=quassel.git

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index a33b942c..9f24007a 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -96,7 +96,7 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   initScriptEngine();
 
   eventManager()->registerObject(ircParser(), EventManager::NormalPriority);
-  eventManager()->registerObject(eventProcessor(), EventManager::HighPriority);
+  eventManager()->registerObject(eventProcessor(), EventManager::HighPriority); // needs to process events *before* the stringifier!
   eventManager()->registerObject(eventStringifier(), EventManager::NormalPriority);
   eventManager()->registerObject(this, EventManager::LowPriority); // for sending MessageEvents to the client
 
@@ -254,8 +254,11 @@ void CoreSession::recvStatusMsgFromServer(QString msg) {
 }
 
 void CoreSession::processMessageEvent(MessageEvent *event) {
-  recvMessageFromServer(event->networkId(), event->msgType(), event->bufferType(), event->target(),
-                        event->text(), event->sender(), event->msgFlags());
+  recvMessageFromServer(event->networkId(), event->msgType(), event->bufferType(),
+                        event->target().isNull()? "" : event->target(),
+                        event->text().isNull()? "" : event->text(),
+                        event->sender().isNull()? "" : event->sender(),
+                        event->msgFlags());
 }
 
 QList<BufferInfo> CoreSession::buffers() const {