From 1b6199f8edd7fc69663b579c16a992d6486950af Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Tue, 10 Feb 2015 13:19:02 -0600
Subject: Remove deletes for images from scroll list GUI Elements

Resources are deleted by ~PageSet and do not need to be deleted
by the the scrollable list elements. This fixes a crash when
reloading the theme.

Also remove some deletes for items that should not be deleted in
button and input GUI elements.

Change-Id: Ie1c1b85c81c10f648d085746a5fdba6220468a5f
---
 gui/button.cpp        | 1 -
 gui/fileselector.cpp  | 2 --
 gui/input.cpp         | 2 --
 gui/listbox.cpp       | 2 --
 gui/partitionlist.cpp | 2 --
 gui/scrolllist.cpp    | 3 ---
 6 files changed, 12 deletions(-)

(limited to 'gui')

diff --git a/gui/button.cpp b/gui/button.cpp
index 097bf7189..943d71914 100644
--- a/gui/button.cpp
+++ b/gui/button.cpp
@@ -130,7 +130,6 @@ GUIButton::~GUIButton()
 	if (mButtonImg)	 	delete mButtonImg;
 	if (mButtonLabel)   delete mButtonLabel;
 	if (mAction)		delete mAction;
-	if (mButtonIcon)	delete mButtonIcon;
 }
 
 int GUIButton::Render(void)
diff --git a/gui/fileselector.cpp b/gui/fileselector.cpp
index c7805c42a..4a26349cd 100644
--- a/gui/fileselector.cpp
+++ b/gui/fileselector.cpp
@@ -141,8 +141,6 @@ GUIFileSelector::GUIFileSelector(xml_node<>* node) : GUIScrollList(node)
 
 GUIFileSelector::~GUIFileSelector()
 {
-	delete mFileIcon;
-	delete mFolderIcon;
 }
 
 int GUIFileSelector::Update(void)
diff --git a/gui/input.cpp b/gui/input.cpp
index bb7bdf853..21b1f0b86 100644
--- a/gui/input.cpp
+++ b/gui/input.cpp
@@ -214,8 +214,6 @@ GUIInput::GUIInput(xml_node<>* node)
 GUIInput::~GUIInput()
 {
 	if (mInputText)	 	delete mInputText;
-	if (mBackground)	delete mBackground;
-	if (mCursor)		delete mCursor;
 	if (mAction)		delete mAction;
 }
 
diff --git a/gui/listbox.cpp b/gui/listbox.cpp
index 545b7a294..89a2c0322 100644
--- a/gui/listbox.cpp
+++ b/gui/listbox.cpp
@@ -103,8 +103,6 @@ GUIListBox::GUIListBox(xml_node<>* node) : GUIScrollList(node)
 
 GUIListBox::~GUIListBox()
 {
-	delete mIconSelected;
-	delete mIconUnselected;
 }
 
 int GUIListBox::Update(void)
diff --git a/gui/partitionlist.cpp b/gui/partitionlist.cpp
index 48bd295d6..7e5a74fa5 100644
--- a/gui/partitionlist.cpp
+++ b/gui/partitionlist.cpp
@@ -96,8 +96,6 @@ GUIPartitionList::GUIPartitionList(xml_node<>* node) : GUIScrollList(node)
 
 GUIPartitionList::~GUIPartitionList()
 {
-	delete mIconSelected;
-	delete mIconUnselected;
 }
 
 int GUIPartitionList::Update(void)
diff --git a/gui/scrolllist.cpp b/gui/scrolllist.cpp
index 02656c79d..3010d3a71 100644
--- a/gui/scrolllist.cpp
+++ b/gui/scrolllist.cpp
@@ -259,9 +259,6 @@ GUIScrollList::GUIScrollList(xml_node<>* node) : GUIObject(node)
 
 GUIScrollList::~GUIScrollList()
 {
-	delete mHeaderIcon;
-	delete mBackground;
-	delete mFont;
 }
 
 void GUIScrollList::SetMaxIconSize(int w, int h)
-- 
cgit v1.2.3