Skip to content

Commit 8184010

Browse files
authored
fix(alsa): safe join on Drop (#1098)
1 parent 313354a commit 8184010

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

src/host/alsa/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1204,7 +1204,9 @@ impl Drop for Stream {
12041204
fn drop(&mut self) {
12051205
self.inner.dropping.store(true, Ordering::Release);
12061206
self.trigger.wakeup();
1207-
self.thread.take().unwrap().join().unwrap();
1207+
if let Some(handle) = self.thread.take() {
1208+
let _ = handle.join();
1209+
}
12081210
}
12091211
}
12101212

src/host/wasapi/stream.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,9 @@ impl Stream {
178178
impl Drop for Stream {
179179
fn drop(&mut self) {
180180
if self.push_command(Command::Terminate).is_ok() {
181-
self.thread.take().unwrap().join().unwrap();
181+
if let Some(handle) = self.thread.take() {
182+
let _ = handle.join();
183+
}
182184
unsafe {
183185
let _ = Foundation::CloseHandle(self.pending_scheduled_event);
184186
}

0 commit comments

Comments
 (0)