From 28b659c027c7a4cfc490b8c9a9c7dbecb4fdb8e7 Mon Sep 17 00:00:00 2001
From: Noldor
Date: Sat, 3 Apr 2010 08:14:46 +0000
Subject: Fixed removing items in logview

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4233 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/logview/logviewmdiwindow.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'src/modules/logview/logviewmdiwindow.cpp')

diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 42136fa32..22830214a 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -390,7 +390,23 @@ void KviLogViewMDIWindow::deleteCurrent()
 			KviPointerList <KviLogListViewItem> itemsList;
 			itemsList.setAutoDelete(false);
 			for(int i=0;i<pItem->childCount();i++)
-				itemsList.append((KviLogListViewItem*)pItem->child(i));
+			{
+				if (!pItem->child(i)->childCount())
+				{
+					itemsList.append((KviLogListViewItem*)pItem->child(i));
+					continue;
+				}
+				KviLogListViewItem* pChild=(KviLogListViewItem*)pItem->child(i);
+				for(int j=0;j<pChild->childCount();j++)
+				{
+					if (!(KviLogListViewItem*)pChild->child(j))
+					{
+						debug ("Null pointer in logviewitem");
+						continue;
+					}
+					itemsList.append((KviLogListViewItem*)pChild->child(j));
+				}
+			}
 			for(unsigned int i=0;i<itemsList.count();i++)
 			{
 				KviLogListViewItem *pCurItem=itemsList.at(i);
@@ -399,13 +415,12 @@ void KviLogViewMDIWindow::deleteCurrent()
 					QString szFname;
 					g_pApp->getLocalKvircDirectory(szFname,KviApp::Log,pCurItem->fileName());
 					KviFileUtils::removeFile(szFname);
-					delete pCurItem;
 				}
 			}
 			delete pItem;
 			return;
 		}
-		if(!pItem->fileName().isNull())
+			if(!pItem->fileName().isNull())
 		{
 			QString szFname;
 			g_pApp->getLocalKvircDirectory(szFname,KviApp::Log,pItem->fileName());
-- 
cgit v1.3.1-10-gc9f91