X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=ddc71dd4f4ab19c5579b07922f93d4e391ee5bfd;hp=4d49efb2daceb1adb3a796aa9c532667b0487ed8;hb=ecf1ab29dd398f0e0beaff327443909096d24f55;hpb=30cc5367bf38d8720e55ece5cab218c4b52e0dbf

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 4d49efb2..ddc71dd4 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -463,6 +463,12 @@ bool QueryBufferItem::setData(int column, const QVariant &value, int role)
     case Qt::EditRole:
     {
         QString newName = value.toString();
+
+        // Sanity check - buffer names must not contain newlines!
+        int nlpos = newName.indexOf('\n');
+        if (nlpos >= 0)
+            newName = newName.left(nlpos);
+
         if (!newName.isEmpty()) {
             Client::renameBuffer(bufferId(), newName);
             return true;