aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Fabio Bas2009-02-25 11:54:11 +0000
committerGravatar Fabio Bas2009-02-25 11:54:11 +0000
commiteb4367c590a29a68a22e97d3e59aa54afe281632 (patch)
tree1f25b68d9e36462b4bf9f6b6f57fb26983884307 /src
parentfix for #374 (diff)
downloadKVIrc-eb4367c590a29a68a22e97d3e59aa54afe281632.tar.gz
KVIrc-eb4367c590a29a68a22e97d3e59aa54afe281632.tar.bz2
KVIrc-eb4367c590a29a68a22e97d3e59aa54afe281632.zip
probably fix for #375
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3098 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/ui/kvi_window.cpp8
-rw-r--r--src/kvirc/ui/kvi_windowlist_tree.cpp5
2 files changed, 9 insertions, 4 deletions
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 17946a47f..78314bb2a 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -383,9 +383,11 @@ void KviWindow::createWindowListItem()
void KviWindow::destroyWindowListItem()
{
- if(!m_pWindowListItem)return;
- g_pFrame->m_pWindowList->removeItem(m_pWindowListItem);
- // m_pWindowListItem = 0; // actually the WindowListItem destructor sets it
+ if(m_pWindowListItem)
+ {
+ g_pFrame->m_pWindowList->removeItem(m_pWindowListItem);
+ m_pWindowListItem = 0;
+ }
}
QToolButton * KviWindow::createToolButton(QWidget * par,const char * nam,int pixon,int,const QString & tooltip,bool bOn)
diff --git a/src/kvirc/ui/kvi_windowlist_tree.cpp b/src/kvirc/ui/kvi_windowlist_tree.cpp
index 3b0f269b9..dadf7daa6 100644
--- a/src/kvirc/ui/kvi_windowlist_tree.cpp
+++ b/src/kvirc/ui/kvi_windowlist_tree.cpp
@@ -447,7 +447,10 @@ KviWindowListItem * KviTreeWindowList::addItem(KviWindow * wnd)
bool KviTreeWindowList::removeItem(KviWindowListItem * it)
{
- delete (KviTreeWindowListItem *)it;
+ if(it)
+ {
+ delete (KviTreeWindowListItem *)it;
+ }
return true;
}