fixing an issue where a network could be created twice in the client

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index ed59b99..02c9a20 100644 (file)
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -284,6 +284,8 @@ void ClientSyncer::syncToCore(const QVariantMap &sessionState) {
   // create network objects
   foreach(QVariant networkid, networkids) {
     NetworkId netid = networkid.value<NetworkId>();
+    if(Client::network(netid))
+      continue;
     Network *net = new Network(netid, Client::instance());
     netsToSync.insert(net);
     connect(net, SIGNAL(initDone()), this, SLOT(networkInitDone()));

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index bc62842..e21d625 100644 (file)
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -91,7 +91,8 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
 #ifdef HAVE_WEBKIT
   webPreview.delayTimer.setSingleShot(true);
   connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreviewEvent()));
-  webPreview.deleteTimer.setInterval(600000);
+  //webPreview.deleteTimer.setInterval(600000);
+  webPreview.deleteTimer.setInterval(10000);
   connect(&webPreview.deleteTimer, SIGNAL(timeout()), this, SLOT(deleteWebPreviewEvent()));
 #endif