From 0dbae4ebef72a457989be35bda64823afc4e7572 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 23 Feb 2022 03:53:04 -0800 Subject: [PATCH] win-dshow: Ensure thread is joinable before joining This may have been the issue behind the reported firefox crashes, but strangely, the thread should always be joinable here because it's explicitly always created in the constructor and joined in the destructor. --- plugins/win-dshow/virtualcam-module/virtualcam-filter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/win-dshow/virtualcam-module/virtualcam-filter.cpp b/plugins/win-dshow/virtualcam-module/virtualcam-filter.cpp index ddd943538..b8c25a5d6 100644 --- a/plugins/win-dshow/virtualcam-module/virtualcam-filter.cpp +++ b/plugins/win-dshow/virtualcam-module/virtualcam-filter.cpp @@ -112,7 +112,8 @@ VCamFilter::VCamFilter() VCamFilter::~VCamFilter() { SetEvent(thread_stop); - th.join(); + if (th.joinable()) + th.join(); video_queue_close(vq); if (placeholder.scaled_data)