From c1104716b8383d737235b72ace516e7267dfb6aa Mon Sep 17 00:00:00 2001
From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Thu, 26 Mar 2009 20:10:39 +0100
Subject: [PATCH] fixes #636 - Sqlite error when merging buffer

---
 src/core/sqlitestorage.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 6b795f28..5fd191bf 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();
-- 
2.20.1