From 043a070f7d4ee691de342bb1c2a8dfb866e99366 Mon Sep 17 00:00:00 2001
From: WinterSolstice8 <60417494+wintersolstice8@users.noreply.github.com>
Date: Tue, 11 Mar 2025 15:44:17 -0600
Subject: [PATCH] [core] Only join messageThread if it is joinable

---
 src/map/map.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/map/map.cpp b/src/map/map.cpp
index 09a7ca539b1..755f546e7cf 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -465,7 +465,10 @@ void do_final(int code)
     trustutils::FreeTrustList();
     zoneutils::FreeZoneList();
 
-    messageThread.join();
+    if (messageThread.joinable())
+    {
+        messageThread.join();
+    }
 
     CTaskMgr::delInstance();
     CVanaTime::delInstance();