From edb33ca383c65c9d174fef0aa3769b34f11e4659 Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Mon, 28 Aug 2023 12:08:23 -0400 Subject: [PATCH] Remove 30-second timeout from thread_join. (#28) --- CHANGELOG.md | 4 ++++ src/acquire-core-platform/win32/platform.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44fdb6f..c6af67f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- Removes 30-second timeout from `thread_join` on Windows. + ### Added - `acquire-device-properties`: A `uint8_t` member `enable_multiscale` of `StorageProperties`. diff --git a/src/acquire-core-platform/win32/platform.c b/src/acquire-core-platform/win32/platform.c index 065b96d..8c20662 100644 --- a/src/acquire-core-platform/win32/platform.c +++ b/src/acquire-core-platform/win32/platform.c @@ -439,7 +439,7 @@ thread_join(struct thread* self) self->inner_ = INVALID_HANDLE_VALUE; TRACE("WFSO %p", thread); WaitForSingleObject(thread, - 30000); // FIXME: (nclack) set this back to INFINITE + INFINITE); CloseHandle(thread); } }