diff options
| author |  Iacopo Palazzi | 2007-04-01 13:18:58 +0000 |
|---|---|---|
| committer | Iacopo Palazzi | 2007-04-01 13:18:58 +0000 |
| commit | ec6d89a30c95643218fa1481ff1508e3a1957c83 (patch) | |
| tree | 6ea7cd3acc4d3ae005858eedbeb8f8035b3e82ac /src/modules/options | |
| parent | *AUTOMATICALLY* updated KVI_SOURCES_DATE variable (diff) | |
| download | KVIrc-ec6d89a30c95643218fa1481ff1508e3a1957c83.tar.gz KVIrc-ec6d89a30c95643218fa1481ff1508e3a1957c83.tar.bz2 KVIrc-ec6d89a30c95643218fa1481ff1508e3a1957c83.zip | |
Fixed bug on KviTextIconsOptionsWidget::commit() crash due to a null pointer operation (QT4)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@452 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/options')
| -rw-r--r-- | src/modules/options/dialog.cpp | 3 | ||||
| -rw-r--r-- | src/modules/options/optw_texticons.cpp | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index ed0befe44..86c4b5e0e 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -55,6 +55,7 @@ #include <qfont.h> #include <qevent.h> +#include <iostream> //extern KviModule * g_pOptionsModule; extern KviDict<KviOptionsDialog> * g_pOptionsDialogDict; @@ -610,6 +611,7 @@ void KviOptionsDialog::applyClicked() void KviOptionsDialog::apply(bool bDialogAboutToClose) { + KviOptionsListViewItem *it = (KviOptionsListViewItem *)m_pListView->firstChild(); while(it) { @@ -625,6 +627,7 @@ void KviOptionsDialog::apply(bool bDialogAboutToClose) } g_pApp->saveConfiguration(); + } void KviOptionsDialog::okClicked() diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index 7a04f1dd5..09edb250e 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -216,6 +216,7 @@ void KviTextIconsOptionsWidget::delClicked() void KviTextIconsOptionsWidget::commit() { + KviOptionsWidget::commit(); g_pTextIconManager->clear(); int n = m_pTable->numRows(); @@ -233,12 +234,11 @@ void KviTextIconsOptionsWidget::commit() } g_pTextIconManager->checkDefaultAssociations(); - for(int i=0;i < n;i++) - { - m_pTable->clearCell(i,0); - m_pTable->clearCell(i,1); - m_pTable->clearCell(i,2); - } + for(int i=0; i<n; i++) + for (int j=0; j<m_pTable->numCols(); j++) + if (m_pTable->item(i,j)) + m_pTable->clearCell(i,j); + } #include "m_optw_texticons.moc" |