summaryrefslogtreecommitdiff
path: root/src/search
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-02-25 00:11:37 (GMT)
committer jacob1 <jfu614@gmail.com>2013-02-25 00:11:37 (GMT)
commitfbf52794e59ede9be4362a8816e0682e41dcf414 (patch)
tree3fce05c90530469832f16648a7adf10adb95b6e9 /src/search
parentb92bd245c8b1311b6cd63171611e47a6468e410f (diff)
downloadpowder-fbf52794e59ede9be4362a8816e0682e41dcf414.zip
powder-fbf52794e59ede9be4362a8816e0682e41dcf414.tar.gz
fix even more memory leaks
Diffstat (limited to 'src/search')
-rw-r--r--src/search/SearchController.cpp3
-rw-r--r--src/search/SearchView.cpp7
2 files changed, 10 insertions, 0 deletions
diff --git a/src/search/SearchController.cpp b/src/search/SearchController.cpp
index 012b761..26b54bb 100644
--- a/src/search/SearchController.cpp
+++ b/src/search/SearchController.cpp
@@ -88,6 +88,8 @@ void SearchController::Exit()
}
if(callback)
callback->ControllerExit();
+ delete callback;
+ callback = NULL;
//HasExited = true;
}
@@ -101,6 +103,7 @@ SearchController::~SearchController()
}
delete searchModel;
delete searchView;
+ delete callback;
}
void SearchController::DoSearch(std::string query, bool now)
diff --git a/src/search/SearchView.cpp b/src/search/SearchView.cpp
index f1f6c3b..3e73496 100644
--- a/src/search/SearchView.cpp
+++ b/src/search/SearchView.cpp
@@ -252,6 +252,13 @@ SearchView::~SearchView()
RemoveComponent(previousButton);
RemoveComponent(infoLabel);
+ for(int i = 0; i < saveButtons.size(); i++)
+ {
+ RemoveComponent(saveButtons[i]);
+ delete saveButtons[i];
+ }
+ saveButtons.clear();
+
delete nextButton;
delete previousButton;
delete infoLabel;