X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=3d26a9b4e26e9cf7f979f8f2428e4e06a1ede150;hp=3b7480fc8d8e24ee89571de4e5ac3a11de02078d;hb=d064f62ec2f316f17c3aac3c31184376380ef098;hpb=0ec6e416209342593e3a85b88f293c4555d3996b

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 3b7480fc..3d26a9b4 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -309,6 +309,7 @@ uint SqliteStorage::getNetworkId(UserId user, const QString &network) {
 
 BufferId SqliteStorage::getBufferId(UserId user, const QString &network, const QString &buffer) {
   BufferId bufferid;
+  uint networkId = getNetworkId(user, network);
   getBufferIdQuery->bindValue(":networkname", network);
   getBufferIdQuery->bindValue(":userid", user);
   getBufferIdQuery->bindValue(":buffername", buffer);
@@ -318,11 +319,11 @@ BufferId SqliteStorage::getBufferId(UserId user, const QString &network, const Q
     createBuffer(user, network, buffer);
     getBufferIdQuery->exec();
     if(getBufferIdQuery->first()) {
-      bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), network, buffer);
+      bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), networkId, 0, network, buffer);
       emit bufferIdUpdated(bufferid);
     }
   } else {
-    bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), network, buffer);
+    bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), networkId, 0, network, buffer);
   }
 
   Q_ASSERT(!getBufferIdQuery->next());
@@ -347,7 +348,7 @@ QList<BufferId> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
   query.exec();
 
   while(query.next()) {
-    bufferlist << BufferId(query.value(0).toUInt(), query.value(1).toString(), query.value(2).toString());
+    bufferlist << BufferId(query.value(0).toUInt(), getNetworkId(user, query.value(1).toString()), 0, query.value(1).toString(), query.value(2).toString());
   }
   return bufferlist;
 }