Make reload thread joinable

This allows us to cleanly shut down if the reload thread is running
ElunaLuaEngine · Jul 17, 2024 · 8c6c47c · 8c6c47c
1 parent 6b3adff
commit 8c6c47c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/ElunaLoader.cpp b/ElunaLoader.cpp
@@ -70,6 +70,10 @@ ElunaLoader* ElunaLoader::instance()
 
 ElunaLoader::~ElunaLoader()
 {
+    // join any previously created reload thread so it can exit cleanly
+    if (_reloadThread.joinable())
+        _reloadThread.join();
+
 #ifdef TRINITY
     if (lua_scriptWatcher >= 0)
     {
@@ -88,11 +92,15 @@ void ElunaLoader::ReloadScriptCache()
         return;
     }
 
+    // try to join any previous thread before starting a new one, just in case
+    if (_reloadThread.joinable())
+        _reloadThread.join();
+
     // set the internal cache state to reinit
     _cacheState = SCRIPT_CACHE_REINIT;
 
     // create new thread to load scripts asynchronously
-    std::thread(&ElunaLoader::LoadScripts, this).detach();
+    _reloadThread = std::thread(&ElunaLoader::LoadScripts, this);
     ELUNA_LOG_DEBUG("[Eluna]: Script cache reload thread started");
 }
 

diff --git a/ElunaLoader.h b/ElunaLoader.h
@@ -80,6 +80,7 @@ class ElunaLoader
 #endif
 protected:
     std::atomic<uint8> _cacheState;
+    std::thread _reloadThread;
 };
 
 #ifdef TRINITY