diff options
| author |  Elvio Basello | 2008-07-29 18:43:26 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-07-29 18:43:26 +0000 |
| commit | 7ae87364fc955eaf6bdcd150560a79c643c56321 (patch) | |
| tree | 0dde471b7a796d5422e037b28250d2121addc9dd /src | |
| parent | fix #191 on trunk (diff) | |
| download | KVIrc-7ae87364fc955eaf6bdcd150560a79c643c56321.tar.gz KVIrc-7ae87364fc955eaf6bdcd150560a79c643c56321.tar.bz2 KVIrc-7ae87364fc955eaf6bdcd150560a79c643c56321.zip | |
fixed segfault
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2136 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/options/optw_proxy.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index fd21d9953..83fccd969 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -29,7 +29,7 @@ #include "kvi_netutils.h" #include "kvi_settings.h" #include "kvi_options.h" -#include <kvi_tal_groupbox.h> +#include "kvi_tal_groupbox.h" #include "kvi_tal_popupmenu.h" #include "kvi_tal_tooltip.h" @@ -211,7 +211,6 @@ void KviProxyOptionsWidget::currentItemChanged(KviTalTreeWidgetItem *it,KviTalTr m_pIpEditor->setAddressType(KviIpEditor::IPv4); #endif - if(!m_pIpEditor->setAddress(m_pLastEditedItem->m_pProxyData->m_szIp)) { #ifdef COMPILE_IPV6_SUPPORT @@ -295,11 +294,10 @@ void KviProxyOptionsWidget::commit() //while(it) for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++) { - it=(KviProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); + it=(KviProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); QString tmp = it->text(0); if(!tmp.isEmpty()) { - debug("Commit proxy name %s",tmp.toUtf8().data()); KviProxy * prx = new KviProxy(*(it->m_pProxyData)); g_pProxyDataBase->insertProxy(prx); @@ -337,8 +335,13 @@ void KviProxyOptionsWidget::removeCurrent() { if(m_pLastEditedItem) { - delete m_pLastEditedItem; + //delete m_pLastEditedItem; + //m_pLastEditedItem = 0; + + KviTalTreeWidgetItem * tmp = m_pLastEditedItem; m_pLastEditedItem = 0; + delete tmp; + KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pTreeWidget->topLevelItem(0); if(it) { |