Event backend porting

[quassel.git] / src / core / ircparser.cpp

diff --git a/src/core/ircparser.cpp b/src/core/ircparser.cpp
index dc9c227..34e693d 100644 (file)
--- a/src/core/ircparser.cpp
+++ b/src/core/ircparser.cpp
@@ -175,6 +175,7 @@ void IrcParser::processNetworkIncoming(NetworkDataEvent *e) {
         msg = decrypt(net, target, msg);
 
         events << new IrcEventRawMessage(EventManager::IrcEventRawPrivmsg, net, prefix, target, msg);
+        //events << new MessageEvent(Message::Plain, net, net->channelDecode(target, msg), target, prefix);
       }
     }
     break;
@@ -241,10 +242,10 @@ void IrcParser::processNetworkIncoming(NetworkDataEvent *e) {
     break;
 
   case EventManager::IrcEventTopic:
-    if(params.count() >= 2) {
+    if(params.count() >= 1) {
       QString channel = net->serverDecode(params.at(0));
       decParams << channel;
-      decParams << net->channelDecode(channel, decrypt(net, channel, params.at(1), true));
+      decParams << (params.count() >= 2? net->channelDecode(channel, decrypt(net, channel, params.at(1), true)) : QString());
     }
     break;