...

1 files changed, 6 insertions, 2 deletions

diff --git a/src/ui/ui_manager.cpp b/src/ui/ui_manager.cpp
index 2ac1c8e7..0c3a8f49 100644
--- a/src/ui/ui_manager.cpp
+++ b/src/ui/ui_manager.cpp
@@ -19,8 +19,12 @@ PredefineResources::PredefineResources() {
 }
 
 UiManager* UiManager::GetInstance() {
-  static UiManager instance;
-  return &instance;
+  static UiManager* instance = new UiManager();
+  platform::native::UiApplication::GetInstance()->AddOnQuitHandler([] {
+    delete instance;
+    instance = nullptr;
+  });
+  return instance;
 }
 
 UiManager::UiManager() : predefine_resources_(new PredefineResources()) {}