From dede5a99d4aac169197d094f486af6e5a8cab656 Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Wed, 4 Feb 2026 16:07:28 -0800
Subject: [PATCH] Fix shutdown order for terrain streaming threads

---
 src/core/application.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/application.cpp b/src/core/application.cpp
index de8df5f5..f50254f4 100644
--- a/src/core/application.cpp
+++ b/src/core/application.cpp
@@ -207,12 +207,16 @@ void Application::run() {
 void Application::shutdown() {
     LOG_INFO("Shutting down application");
 
+    // Stop renderer first: terrain streaming workers may still be reading via
+    // AssetManager during shutdown, so renderer/terrain teardown must complete
+    // before AssetManager is destroyed.
+    renderer.reset();
+
     world.reset();
     gameHandler.reset();
     authHandler.reset();
     assetManager.reset();
     uiManager.reset();
-    renderer.reset();
     window.reset();
 
     running = false;