X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;fp=src%2Fcore%2Fnetworkconnection.cpp;h=69ce036939361bd1d10878ad654a58e49aeedbc2;hp=67137653c40b5205fa31179ad78bcd37c34b4b7a;hb=f2329ae63c2e0c986be9f91e676b33b202ec592a;hpb=4dabe69f242f8a760c1aef549d41aec23d2aed23

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index 67137653..69ce0369 100644
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -470,12 +470,9 @@ void NetworkConnection::putCmd(const QString &cmd, const QList<QByteArray> &para
   if(cmd == "PRIVMSG" && params.count() > 1) {
     int overrun = lastParamOverrun(cmd, params);
     if(overrun) {
-      QList<QByteArray> paramCopy1;
-      QList<QByteArray> paramCopy2;
-      for(int i = 0; i < params.count() - 1; i++) {
-	paramCopy1 << params[i];
-	paramCopy2 << params[i];
-      }
+      QList<QByteArray> paramCopy1 = params;
+      paramCopy1.removeLast();
+      QList<QByteArray> paramCopy2 = paramCopy1;
 
       QByteArray lastPart = params.last();
       QByteArray splitter(" .,-");
@@ -484,8 +481,7 @@ void NetworkConnection::putCmd(const QString &cmd, const QList<QByteArray> &para
       for(int i = 0; i < splitter.size(); i++) {
 	splitPos = qMax(splitPos, lastPart.lastIndexOf(splitter[i], maxSplitPos));
       }
-
-      if(splitPos == -1) {
+      if(splitPos <= 0) {
 	splitPos = maxSplitPos;
       }