From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 18 Feb 2008 14:35:30 +0000 (+0000)
Subject: Try to fix a crash in NetworksSettingsPage. Please report when the Q_ASSERT around
X-Git-Tag: 0.2.0-alpha1~47
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=87b24eb1af046b40109dcba3a9f65b7939d3a35d;p=quassel.git

Try to fix a crash in NetworksSettingsPage. Please report when the Q_ASSERT around
line 227 still triggers...
---

diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp
index 65301f0f..80da554c 100644
--- a/src/qtui/settingspages/networkssettingspage.cpp
+++ b/src/qtui/settingspages/networkssettingspage.cpp
@@ -220,7 +220,14 @@ void NetworksSettingsPage::setItemState(NetworkId id, QListWidgetItem *item) {
         if(oldid > 0) continue;  // only locally created nets should be replaced
         if(oldid == currentId) select = true;
         int row = ui.networkList->row(i);
-        if(row >= 0) delete ui.networkList->takeItem(row);
+        if(row >= 0) {
+          QListWidgetItem *olditem = ui.networkList->takeItem(row);
+          if(!olditem) {
+            qWarning() << "NetworksSettingsPage::setItemState(): Why the heck don't we have an itempointer here?";
+            Q_ASSERT(olditem);  // abort non-gracefully, I need to figure out what's causing this
+          }
+          else delete olditem;
+        }
         networkInfos.remove(oldid);
         break;
       }