From: Manuel Nickschas Date: Tue, 26 Feb 2008 23:00:53 +0000 (+0000) Subject: Finally fixed that ***** crash during network configuration. X-Git-Tag: 0.2.0-alpha2~18 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=f2c9c9f60421892c011f6f11e5b5d7990394d7ac Finally fixed that ***** crash during network configuration. --- diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp index 8e03ce62..f32540c9 100644 --- a/src/qtui/settingspages/networkssettingspage.cpp +++ b/src/qtui/settingspages/networkssettingspage.cpp @@ -230,17 +230,13 @@ void NetworksSettingsPage::setItemState(NetworkId id, QListWidgetItem *item) { if(oldid == currentId) { select = true; currentId = 0; + ui.networkList->clearSelection(); } int row = ui.networkList->row(i); if(row >= 0) { - qDebug() << "ABOUT TO REMOVE: id=" << oldid << "from row" << row; QListWidgetItem *olditem = ui.networkList->takeItem(row); - qDebug() << "Successfully removed item from list."; - 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; + Q_ASSERT(olditem); + delete olditem; } networkInfos.remove(oldid); break; @@ -403,7 +399,7 @@ void NetworksSettingsPage::displayNetwork(NetworkId id) { foreach(QVariant v, info.serverList) { ui.serverList->addItem(QString("%1:%2").arg(v.toMap()["Host"].toString()).arg(v.toMap()["Port"].toUInt())); } - setItemState(id); + //setItemState(id); ui.randomServer->setChecked(info.useRandomServer); ui.performEdit->setPlainText(info.perform.join("\n")); ui.autoIdentify->setChecked(info.useAutoIdentify); diff --git a/version.inc b/version.inc index 959caa98..32e3c1bd 100644 --- a/version.inc +++ b/version.inc @@ -3,9 +3,9 @@ { using namespace Global; - quasselVersion = "0.2.0-alpha1"; - quasselDate = "2008-02-24"; - quasselBuild = 586; + quasselVersion = "0.2.0-alpha1+"; + quasselDate = "2008-02-27"; + quasselBuild = 587; //! Minimum client build number the core needs clientBuildNeeded = 563;