X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2FSQL%2FSQLite%2F21%2Fselect_messagesNewerThan.sql;h=bac2a0476ec9ab06b422b764abd0f0311e548956;hb=cbc57790069f3bc3e54c59e54cd3274abff536e6;hp=69d948d6cadc9a58294989ee884341e2203f1788;hpb=31c1e758654388b080ce1dee7065afa053efc1b8;p=quassel.git

diff --git a/src/core/SQL/SQLite/21/select_messagesNewerThan.sql b/src/core/SQL/SQLite/21/select_messagesNewerThan.sql
index 69d948d6..bac2a047 100644
--- a/src/core/SQL/SQLite/21/select_messagesNewerThan.sql
+++ b/src/core/SQL/SQLite/21/select_messagesNewerThan.sql
@@ -1,7 +1,8 @@
 SELECT messageid, time,  type, flags, sender, message
 FROM backlog
 JOIN sender ON backlog.senderid = sender.senderid
-WHERE bufferid = :bufferid
-    AND backlog.messageid >= :firstmsg
+WHERE backlog.messageid >= :firstmsg
+    AND backlog.messageid <= (SELECT buffer.lastmsgid FROM buffer WHERE buffer.bufferid = :bufferid)
+    AND bufferid = :bufferid
 ORDER BY messageid DESC
 LIMIT :limit