fixes #636 - Sqlite error when merging buffer

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 6b795f2..5fd191b 100644 (file)
--- 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());
   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();
   safeExec(delBufferQuery);
   if(!watchQuery(delBufferQuery)) {
     db.rollback();