X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=2f4fa091219643a22513145ea4a1ccd4eb9319b2;hp=6b795f28a72c355607ffaac57dbfe4b0a72d470f;hb=16c9fb5606113ddbcbe4be61f8ed2b775f31055e;hpb=ab16c77fe03b73a863d9b52b11919bcbac903f58

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 6b795f28..2f4fa091 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -1146,6 +1146,7 @@ bool SqliteStorage::mergeBuffersPermanently(const UserId &user, const BufferId &
   QSqlQuery delBufferQuery(db);
   delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
   delBufferQuery.bindValue(":bufferid", bufferId2.toInt());
+  delBufferQuery.bindValue(":userid", user.toInt());
   safeExec(delBufferQuery);
   if(!watchQuery(delBufferQuery)) {
     db.rollback();
@@ -1631,7 +1632,7 @@ bool SqliteMigrationReader::readMo(BacklogMO &backlog) {
   }
 
   backlog.messageid = value(0).toInt();
-  backlog.time = QDateTime::fromTime_t(value(1).toInt());
+  backlog.time = QDateTime::fromTime_t(value(1).toInt()).toUTC();
   backlog.bufferid = value(2).toInt();
   backlog.type = value(3).toInt();
   backlog.flags = value(4).toInt();