projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fbc4df8
)
(no commit message)
author
Marcus Eggenberger
<egs@quassel-irc.org>
Mon, 5 Nov 2007 16:32:51 +0000
(16:32 +0000)
committer
Marcus Eggenberger
<egs@quassel-irc.org>
Mon, 5 Nov 2007 16:32:51 +0000
(16:32 +0000)
src/core/sqlitestorage.cpp
patch
|
blob
|
history
diff --git
a/src/core/sqlitestorage.cpp
b/src/core/sqlitestorage.cpp
index
d8dc9ba
..
ffd2872
100644
(file)
--- a/
src/core/sqlitestorage.cpp
+++ b/
src/core/sqlitestorage.cpp
@@
-305,8
+305,16
@@
uint SqliteStorage::getNetworkId(UserId user, const QString &network) {
if(query.first())
return query.value(0).toUInt();
if(query.first())
return query.value(0).toUInt();
- else
- return 0;
+ else {
+ createBuffer(user, network, "");
+ query.exec();
+ if(query.first())
+ return query.value(0).toUInt();
+ else {
+ qWarning() << "NETWORK NOT FOUND:" << network << "for User:" << user;
+ return 0;
+ }
+ }
}
BufferInfo SqliteStorage::getBufferInfo(UserId user, const QString &network, const QString &buffer) {
}
BufferInfo SqliteStorage::getBufferInfo(UserId user, const QString &network, const QString &buffer) {
@@
-320,8
+328,6
@@
BufferInfo SqliteStorage::getBufferInfo(UserId user, const QString &network, con
if(!getBufferInfoQuery->first()) {
createBuffer(user, network, buffer);
if(!getBufferInfoQuery->first()) {
createBuffer(user, network, buffer);
- // TODO: get rid of this hackaround
- networkId = getNetworkId(user, network);
getBufferInfoQuery->exec();
if(getBufferInfoQuery->first()) {
bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer);
getBufferInfoQuery->exec();
if(getBufferInfoQuery->first()) {
bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer);