From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 26 Jun 2008 23:27:04 +0000 (+0200)
Subject: Workaround #151 (deleting and readding a network with the same name)
X-Git-Tag: 0.3.0~340
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=6026772458c5d3d405cf813395ca05090b967893;hp=c2f45eb02e610ff44576b649ea075b23df1b8f1a

Workaround #151 (deleting and readding a network with the same name)

Real reason lies in the storage engine and still needs to be fixed;
however, the problem described in #151 is solved with this workaround.
---

diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp
index 15afeff1..7c06ed48 100644
--- a/src/qtui/settingspages/networkssettingspage.cpp
+++ b/src/qtui/settingspages/networkssettingspage.cpp
@@ -696,6 +696,9 @@ SaveNetworksDlg::SaveNetworksDlg(const QList<NetworkInfo> &toCreate, const QList
     connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientEvent()));
     connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientEvent()));
 
+    foreach(NetworkId id, toRemove) {
+      Client::removeNetwork(id);
+    }
     foreach(NetworkInfo info, toCreate) {
       Client::createNetwork(info);
     }
@@ -710,9 +713,6 @@ SaveNetworksDlg::SaveNetworksDlg(const QList<NetworkInfo> &toCreate, const QList
       connect(net, SIGNAL(updatedRemotely()), this, SLOT(clientEvent()));
       Client::updateNetwork(info);
     }
-    foreach(NetworkId id, toRemove) {
-      Client::removeNetwork(id);
-    }
   } else {
     qWarning() << "Sync dialog called without stuff to change!";
     accept();