summaryrefslogtreecommitdiff
path: root/src/search
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-06-20 12:40:34 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-06-20 12:40:34 (GMT)
commite81e18238df47212d84fa00422a64983857e1ea1 (patch)
tree67c973f1f3666f9f4b230524575cda5dd6cc4cd6 /src/search
parent2be9c925088c16beb144dd9932202416d00ff581 (diff)
parentf6403958de1f67d3bce47f56b40de254c30f5ba4 (diff)
downloadpowder-e81e18238df47212d84fa00422a64983857e1ea1.zip
powder-e81e18238df47212d84fa00422a64983857e1ea1.tar.gz
Merge branch 'master' of github.com:FacialTurd/PowderToypp
Diffstat (limited to 'src/search')
-rw-r--r--src/search/SearchController.cpp1
-rw-r--r--src/search/SearchView.cpp7
2 files changed, 8 insertions, 0 deletions
diff --git a/src/search/SearchController.cpp b/src/search/SearchController.cpp
index aff9636..68fe978 100644
--- a/src/search/SearchController.cpp
+++ b/src/search/SearchController.cpp
@@ -89,6 +89,7 @@ SearchController::~SearchController()
ui::Engine::Ref().CloseWindow();
}
delete searchModel;
+ delete searchView;
}
void SearchController::DoSearch(std::string query)
diff --git a/src/search/SearchView.cpp b/src/search/SearchView.cpp
index 47392fa..2c56ae0 100644
--- a/src/search/SearchView.cpp
+++ b/src/search/SearchView.cpp
@@ -210,6 +210,13 @@ void SearchView::doSearch()
SearchView::~SearchView()
{
+ RemoveComponent(nextButton);
+ RemoveComponent(previousButton);
+ RemoveComponent(infoLabel);
+
+ delete nextButton;
+ delete previousButton;
+ delete infoLabel;
}
void SearchView::NotifySortChanged(SearchModel * sender)