From 30dd4f255c635025e24636dcddc11071de789def Mon Sep 17 00:00:00 2001
From: GeorgH93 <git@georgh93.eu>
Date: Fri, 23 Oct 2020 11:22:33 +0200
Subject: [PATCH] Cleanup for GraphicsAppManager

---
 openVulkanoCpp/Host/GraphicsAppManager.cpp | 9 +++++++--
 openVulkanoCpp/Host/GraphicsAppManager.hpp | 2 +-
 openVulkanoCpp/main.cpp                    | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/openVulkanoCpp/Host/GraphicsAppManager.cpp b/openVulkanoCpp/Host/GraphicsAppManager.cpp
index 0797cc6..98bc5d7 100644
--- a/openVulkanoCpp/Host/GraphicsAppManager.cpp
+++ b/openVulkanoCpp/Host/GraphicsAppManager.cpp
@@ -32,7 +32,11 @@ namespace openVulkanoCpp
 		window->SetWindowHandler(this);
 	}
 
-	GraphicsAppManager::~GraphicsAppManager() noexcept = default;
+	GraphicsAppManager::~GraphicsAppManager() noexcept
+	{
+		if (windowTitleFormat.empty()) return;
+		ShutDown();
+	}
 
 	void GraphicsAppManager::Stop()
 	{
@@ -111,13 +115,14 @@ namespace openVulkanoCpp
 		}
 	}
 
-	void GraphicsAppManager::ShutDown() const
+	void GraphicsAppManager::ShutDown()
 	{
 		Logger::MANAGER->info("Shutting down ...");
 		renderer->Close();
 		window->Close();
 		platform->Close();
 		app->Close();
+		windowTitleFormat = "";
 		Logger::MANAGER->info("Shutdown complete");
 	}
 
diff --git a/openVulkanoCpp/Host/GraphicsAppManager.hpp b/openVulkanoCpp/Host/GraphicsAppManager.hpp
index 61e68f3..bc69410 100644
--- a/openVulkanoCpp/Host/GraphicsAppManager.hpp
+++ b/openVulkanoCpp/Host/GraphicsAppManager.hpp
@@ -69,7 +69,7 @@ namespace openVulkanoCpp
 
 		void LoopTick();
 
-		void ShutDown() const;
+		void ShutDown();
 
 		void UpdateFps();
 
diff --git a/openVulkanoCpp/main.cpp b/openVulkanoCpp/main.cpp
index 26965bd..d567950 100644
--- a/openVulkanoCpp/main.cpp
+++ b/openVulkanoCpp/main.cpp
@@ -13,7 +13,7 @@ int main(int argc, char** argv)
 	const auto cubesApp = CubesExampleApp::Create();
 	int threads = 4;
 	openVulkanoCpp::EngineConfiguration::GetEngineConfiguration()->SetNumThreads(threads);
-	openVulkanoCpp::IGraphicsAppManager* manager = new openVulkanoCpp::GraphicsAppManager(cubesApp.get());
-	manager->Run();
+	openVulkanoCpp::GraphicsAppManager manager(cubesApp.get());
+	manager.Run();
 	return 0;
 }