X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.cpp;h=d10a9bcc1f9ea2043dd1736b79bc64f7b694263f;hp=ab81fe268fcb7e746a3365801e471388c414a598;hb=17492fb6c867296692b782227de660d352545f73;hpb=934ff82a6554ea72ea449c561f53804dbafc20f0

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index ab81fe26..d10a9bcc 100644
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -307,10 +307,12 @@ void MessageModel::customEvent(QEvent *event) {
 }
 
 void MessageModel::clear() {
-  beginRemoveRows(QModelIndex(), 0, rowCount() - 1);
-  removeAllMessages();
-  endRemoveRows();
   _messagesWaiting.clear();
+  if (rowCount() > 0) {
+    beginRemoveRows(QModelIndex(), 0, rowCount() - 1);
+    removeAllMessages();
+    endRemoveRows();
+  }
 }
 
 // returns index of msg with given Id or of the next message after that (i.e., the index where we'd insert this msg)
@@ -407,7 +409,7 @@ QVariant MessageModelItem::data(int column, int role) const {
     return QVariant();
 
   switch(role) {
-    case MessageModel::MessageRole: return QVariant::fromValue<Message>(_msg);
+    case MessageModel::MessageRole: return QVariant::fromValue<Message>(message());
     case MessageModel::MsgIdRole: return QVariant::fromValue<MsgId>(msgId());
     case MessageModel::BufferIdRole: return QVariant::fromValue<BufferId>(bufferId());
     case MessageModel::TypeRole: return msgType();
@@ -422,9 +424,6 @@ bool MessageModelItem::setData(int column, const QVariant &value, int role) {
   Q_UNUSED(column);
 
   switch(role) {
-  case MessageModel::FlagsRole:
-    _msg.setFlags((Message::Flags)value.toUInt());
-    return true;
   case MessageModel::RedirectedToRole:
     _redirectedTo = value.value<BufferId>();
     return true;