X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=31ab7a3fc90c5ffe9f9878cb93e390e05caa1f62;hb=39eb2fda3eaef2de78a8134556015ff86e9b85d4;hp=1cac5aad02a182d81a6e91454cbb85b2fcc09529;hpb=ab16c77fe03b73a863d9b52b11919bcbac903f58;p=quassel.git

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 1cac5aad..31ab7a3f 100644
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -169,7 +169,7 @@ void UserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &m
   QString sane_msg = msg;
   sane_msg.replace(QRegExp(", +"), ",");
   QStringList params = sane_msg.trimmed().split(" ");
-  QStringList chans = params[0].split(",");
+  QStringList chans = params[0].split(",", QString::SkipEmptyParts);
   QStringList keys;
   int i;
   for(i = 0; i < chans.count(); i++) {
@@ -392,7 +392,7 @@ void UserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo,
 
 void UserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray &message) {
   static const char *cmd = "PRIVMSG";
-  int overrun = lastParamOverrun(cmd, QList<QByteArray>() << message);
+  int overrun = lastParamOverrun(cmd, QList<QByteArray>() << target << message);
   if(overrun) {
     static const char *splitter = " .,-";
     int maxSplitPos = message.count() - overrun;
@@ -440,7 +440,6 @@ int UserInputHandler::lastParamOverrun(const QString &cmd, const QList<QByteArra
   }
 }
 
-
 void UserInputHandler::timerEvent(QTimerEvent *event) {
   if(!_delayedCommands.contains(event->timerId())) {
     QObject::timerEvent(event);