- msgList = Core::requestMsgs(coreSession()->user(), bufferId, -1, last, additional);
- msgIter = msgList.constBegin();
- msgListEnd = msgList.constEnd();
- while(msgIter != msgListEnd) {
- backlog << qVariantFromValue(*msgIter);
- msgIter++;
+
+ if (additional && limit != 0) {
+ MsgId oldestMessage = first;
+ if (!msgList.isEmpty()) {
+ if (msgList.first().msgId() < msgList.last().msgId())
+ oldestMessage = msgList.first().msgId();
+ else
+ oldestMessage = msgList.last().msgId();
+ }
+
+ if (first != -1) {
+ last = first;
+ }
+ else {
+ last = oldestMessage;
+ }
+
+ // only fetch additional messages if they continue seemlessly
+ // that is, if the list of messages is not truncated by the limit
+ if (last == oldestMessage) {
+ msgList = Core::requestMsgs(coreSession()->user(), bufferId, -1, last, additional);
+ msgIter = msgList.constBegin();
+ msgListEnd = msgList.constEnd();
+ while (msgIter != msgListEnd) {
+ backlog << qVariantFromValue(*msgIter);
+ ++msgIter;
+ }
+ }