X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;h=0a2604c0964b04e7afb505ff677533bdf5c806c2;hp=e56bb93378f2c09d33560434ba7c35b52abe26a4;hb=70638bdb6a34f51409d4618128fbfd5b56af0e52;hpb=b709cbc76fc0bd0f14839b4c04ba8caf78d775f1;ds=sidebyside

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index e56bb933..0a2604c0 100644
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -235,7 +235,8 @@ void NetworkConnection::sendPerform() {
       channels.append(chan);
     }
   }
-  userInputHandler()->handleJoin(statusBuf, QString("%1 %2").arg(channels.join(",")).arg(keys.join(",")));
+  QString joinString = QString("%1 %2").arg(channels.join(",")).arg(keys.join(",")).trimmed();
+  if(!joinString.isEmpty()) userInputHandler()->handleJoin(statusBuf, joinString);
 }
 
 void NetworkConnection::disconnectFromIrc() {
@@ -264,6 +265,8 @@ void NetworkConnection::socketError(QAbstractSocket::SocketError) {
     setConnectionState(Network::Disconnected);
     socketDisconnected();
   }
+  //qDebug() << "exiting...";
+  //exit(1);
 }
 
 void NetworkConnection::socketConnected() {