Make pending streams not call OSTerminateThread on early exit

jp9000 · Oct 3, 2014 · c4a77ac · c4a77ac
1 parent 9c10e0f
commit c4a77ac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/OBSApi/Utility/RAIIHelpers.h b/OBSApi/Utility/RAIIHelpers.h
@@ -45,6 +45,12 @@ struct ThreadDeleter
     void operator()(HANDLE h) const { if (!h) return; OSTerminateThread(h, args ...); }
 };
 
+template <DWORD exitCode=0>
+struct ThreadTerminator
+{
+    void operator()(HANDLE h) const { if (!h) return; Log(L"Terminating 0x%x", GetThreadId(h)); TerminateThread(h, exitCode); }
+};
+
 struct ScopedLock
 {
     bool locked, unlock;

diff --git a/Source/OBS.h b/Source/OBS.h
@@ -1287,7 +1287,7 @@ class OBS
 
     struct PendingStreams
     {
-        using thread_t = std::unique_ptr<void, ThreadDeleter<>>;
+        using thread_t = std::unique_ptr<void, ThreadTerminator<>>;
         std::list<thread_t> streams;
         std::unique_ptr<void, MutexDeleter> mutex;
         PendingStreams() : mutex(OSCreateMutex()) {}