From fd78d9fab7dedfde4b0ddac84a2caf6ac8740b51 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Mon, 26 Mar 2012 14:46:42 +0000
Subject: [PATCH] gui/widget/menue.cpp: add param delete_items to
 CMenuWidget::resetWidget, use resetWidget in destructor

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2161 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/384ec65631b206a61a53ac12443008a310d71a7e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-26 (Mon, 26 Mar 2012)



------------------
This commit was generated by Migit
---
 src/gui/widget/menue.cpp | 8 ++++++--
 src/gui/widget/menue.h   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 8a45f39f3..87c74bae2 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -380,6 +380,7 @@ void CMenuWidget::move(int xoff, int yoff)
 
 CMenuWidget::~CMenuWidget()
 {
+#if 0
 	for(unsigned int count=0;count<items.size();count++) {
 		CMenuItem * item = items[count];
 		if ((item != GenericMenuSeparator) &&
@@ -392,6 +393,8 @@ CMenuWidget::~CMenuWidget()
 	
 	items.clear();
 	page_start.clear();
+#endif
+	resetWidget(true);
 }
 
 void CMenuWidget::addItem(CMenuItem* menuItem, const bool defaultselected)
@@ -411,7 +414,7 @@ void CMenuWidget::addItem(CMenuItem* menuItem, const bool defaultselected)
 	items.push_back(menuItem);
 }
 
-void CMenuWidget::resetWidget()
+void CMenuWidget::resetWidget(bool delete_items)
 {
 	for(unsigned int count=0;count<items.size();count++) {
 		CMenuItem * item = items[count];
@@ -419,7 +422,8 @@ void CMenuWidget::resetWidget()
 		    (item != GenericMenuSeparatorLine) &&
 		    (item != GenericMenuBack) &&
 		    (item != GenericMenuCancel)){
-			//delete item;//FIXME: possible crash here
+			if(delete_items)
+				delete item;
 			item = NULL;
 		}
 	}
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index 07b9a8b81..f68717a28 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -446,7 +446,7 @@ class CMenuWidget : public CMenuTarget
 		};
 		virtual void addIntroItems(neutrino_locale_t subhead_text = NONEXISTANT_LOCALE, neutrino_locale_t section_text = NONEXISTANT_LOCALE, int buttontype = BTN_TYPE_BACK );
 		bool hasItem();
-		void resetWidget();
+		void resetWidget(bool delete_items = false);
 		void insertItem(const uint& item_id, CMenuItem* menuItem);
 		void removeItem(const uint& item_id);
 		int getItemId(CMenuItem* menuItem);