1 files changed, 18 insertions, 3 deletions
diff --git a/src/Common/ThreadManager.h b/src/Common/ThreadManager.h
index 07ab196..6e8616f 100644
--- a/src/Common/ThreadManager.h
+++ b/src/Common/ThreadManager.h
@@ -41,6 +41,8 @@ class ThreadManager : public Initializable {
     gl_thread_t mainThread, workerThread, loggerThread;
     std::set<gl_thread_t> threads;
 
+    gl_lock_t threadLock;
+
     gl_lock_t runLock;
     bool running;
 
@@ -64,19 +66,32 @@ class ThreadManager : public Initializable {
 
     void workerFunc();
 
+    void threadFinished(gl_thread_t thread) {
+      gl_lock_lock(threadLock);
+      threads.erase(thread);
+      gl_lock_unlock(threadLock);
+
+      gl_thread_join(thread, 0);
+    }
+
   protected:
     virtual void doInit();
     virtual void doDeinit();
 
   public:
-    bool isThisMainThread() const {
+    bool isThisMainThread() {
       return (mainThread == (gl_thread_t)gl_thread_self());
     }
 
-    bool isThisWorkerThread() const {
-      return (workerThread == (gl_thread_t)gl_thread_self());
+    bool isThisWorkerThread() {
+      gl_lock_lock(threadLock);
+      bool ret = (workerThread == (gl_thread_t)gl_thread_self());
+      gl_lock_unlock(threadLock);
+      return ret;
     }
 
+    void detach();
+
     void pushWork(const sigc::slot<void> &newWork);
 
     static ThreadManager* get() {