From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Mon, 5 Nov 2007 16:32:51 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 0.1.0~82
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=849a08cae7c2e3c40c7da34c7cee1e10057f551e;ds=sidebyside

---

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index d8dc9bad..ffd28728 100644
--- 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();
-  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) {
@@ -320,8 +328,6 @@ BufferInfo SqliteStorage::getBufferInfo(UserId user, const QString &network, con
 
   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);