Controllers should free their callbacks and views

src/console/ConsoleController.cpp

@@ -70,6 +70,11 @@ ConsoleView * ConsoleController::GetView()
 }
 
 ConsoleController::~ConsoleController() {
-	// TODO Auto-generated destructor stub
+	if(ui::Engine::Ref().GetWindow() == consoleView)
+		ui::Engine::Ref().CloseWindow();
+	if(callback)
+		delete callback;
+	delete consoleModel;
+	delete consoleView;
 }
 

src/game/GameController.cpp

@@ -161,6 +161,7 @@ GameController::~GameController()
 		ui::Engine::Ref().CloseWindow();
 	}
 	delete gameModel;
+	delete gameView;
 }
 
 GameView * GameController::GetView()

src/localbrowser/LocalBrowserController.cpp

@@ -130,6 +130,11 @@ void LocalBrowserController::Exit()
 }
 
 LocalBrowserController::~LocalBrowserController() {
-	// TODO Auto-generated destructor stub
+	if(ui::Engine::Ref().GetWindow() == browserView)
+		ui::Engine::Ref().CloseWindow();
+	if(callback)
+		delete callback;
+	delete localBrowserModel;
+	delete localBrowserView;
 }
 

src/login/LoginController.cpp

@@ -49,5 +49,6 @@ LoginController::~LoginController() {
 		ui::Engine::Ref().CloseWindow();
 	}
 	delete loginModel;
+	delete loginView;
 }
 

src/options/OptionsController.cpp

@@ -70,5 +70,8 @@ OptionsController::~OptionsController() {
 		ui::Engine::Ref().CloseWindow();
 	}
 	delete model;
+	delete view;
+	if(callback)
+		delete callback;
 }
 

src/preview/PreviewController.cpp

@@ -103,5 +103,8 @@ PreviewController::~PreviewController() {
 		ui::Engine::Ref().CloseWindow();
 	}
 	delete previewModel;
+	delete previewView;
+	if(callback)
+		delete callback;
 }
 

src/render/RenderController.cpp

@@ -64,5 +64,6 @@ RenderController::~RenderController() {
 	if(callback)
 		delete callback;
 	delete renderModel;
+	delete renderView;
 }
 

src/search/SearchController.cpp

@@ -89,6 +89,7 @@ SearchController::~SearchController()
 		ui::Engine::Ref().CloseWindow();
 	}
 	delete searchModel;
+	delete searchView;
 }
 
 void SearchController::DoSearch(std::string query)

src/ssave/SSaveController.cpp

@@ -51,5 +51,9 @@ void SSaveController::Exit()
 SSaveController::~SSaveController() {
 	if(ui::Engine::Ref().GetWindow() == ssaveView)
 		ui::Engine::Ref().CloseWindow();
+	delete ssaveModel;
+	delete ssaveView;
+	if(callback)
+		delete callback;
 }
 

src/tags/TagsController.cpp

@@ -50,6 +50,11 @@ void TagsController::Exit()
 }
 
 TagsController::~TagsController() {
-	// TODO Auto-generated destructor stub
+	if(ui::Engine::Ref().GetWindow() == tagsView)
+		ui::Engine::Ref().CloseWindow();
+	delete tagsModel;
+	delete tagsView;
+	if(callback)
+		delete callback;
 }