From 470a28f188f9531972944413bde1a43f9cd86343 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Thu, 6 Nov 2008 13:55:33 +0100 Subject: [PATCH] fixing an issue where a network could be created twice in the client --- src/client/clientsyncer.cpp | 2 ++ src/qtui/chatscene.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp index ed59b996..02c9a203 100644 --- 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(); + 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 bc628428..e21d625c 100644 --- 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 -- 2.20.1