X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=b760957f13de4195fd6eb296c45d002ae8ed1d17;hp=61671707638c1771b235c6aabc944f45458baaec;hb=cf0b6a0de9d1d92c49477ae7b86eb07e9b8ca1fe;hpb=a787e8b6e8dd5357531fa89d22da95ebf987469c

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 61671707..b760957f 100644
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -27,6 +27,7 @@
 #include "ircuser.h"
 
 #include <QDebug>
+#include <QRegExp>
 
 UserInputHandler::UserInputHandler(NetworkConnection *parent) : BasicHandler(parent) {
 }
@@ -152,14 +153,18 @@ void UserInputHandler::handleInvite(const BufferInfo &bufferInfo, const QString
 }
 
 void UserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &msg) {
-  Q_UNUSED(bufferInfo)
-  QStringList params = msg.trimmed().split(" ");
+  Q_UNUSED(bufferInfo);
+
+  // trim spaces before chans or keys
+  QString sane_msg = msg;
+  sane_msg.replace(QRegExp(", +"), ",");
+  QStringList params = sane_msg.trimmed().split(" ");
   QStringList chans = params[0].split(",");
   QStringList keys;
   int i;
   for(i = 0; i < chans.count(); i++) {
-    if (chans.at(i)[0].isLetterOrNumber())
-      chans[i].prepend(QChar('#'));
+    if(!network()->isChannelName(chans[i]))
+      chans[i].prepend('#');
   }
   params[0] = chans.join(",");
   if(params.count() > 1) keys = params[1].split(",");