projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
29c6d83
)
fixes #636 - Sqlite error when merging buffer
author
Marcus Eggenberger
<egs@quassel-irc.org>
Thu, 26 Mar 2009 19:10:39 +0000
(20:10 +0100)
committer
Marcus Eggenberger
<egs@quassel-irc.org>
Thu, 26 Mar 2009 19:10:39 +0000
(20:10 +0100)
src/core/sqlitestorage.cpp
patch
|
blob
|
history
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());
+ delBufferQuery.bindValue(":userid", user.toInt());
safeExec(delBufferQuery);
if(!watchQuery(delBufferQuery)) {
db.rollback();