X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;h=bfc85aa1ce6140ca69b465216c0ad7a33cdfb72d;hp=c7fa14828b36c7a70dfd2afaf5bc72d92487db74;hb=ae064f8e3c5f48f6ec78c81a6477e2e8fb26a2f5;hpb=2902a0da662ba40083688a704bd6bd60d0df47bd

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index c7fa1482..bfc85aa1 100644
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -434,7 +434,10 @@ int NetworkConnection::lastParamOverrun(const QString &cmd, const QList<QByteArr
   // that means that the last message can be as long as:
   // 512 - nicklen - userlen - hostlen - commandlen - sum(param[0]..param[n-1])) - 2 (for CRLF) - 4 (":!@" + 1space between prefix and command) - max(paramcount - 1, 0) (space for simple params) - 2 (space and colon for last param)
   IrcUser *me = network()->me();
-  int maxLen = 512 - serverEncode(me->nick()).count() - serverEncode(me->user()).count() - serverEncode(me->host()).count() - cmd.toAscii().count() - 6;
+  int maxLen = 480 - cmd.toAscii().count(); // educated guess in case we don't know us (yet?)
+
+  if(me)
+    maxLen = 512 - serverEncode(me->nick()).count() - serverEncode(me->user()).count() - serverEncode(me->host()).count() - cmd.toAscii().count() - 6;
 
   if(!params.isEmpty()) {
     for(int i = 0; i < params.count() - 1; i++) {