summaryrefslogtreecommitdiff
path: root/src/output
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2021-03-08 22:27:16 +0100
committerMax Kellermann <max@musicpd.org>2021-03-08 22:27:46 +0100
commit29346dc9c54fd0d469edcf7e4ff9558454d01554 (patch)
tree199d6cfd52757185a04a5d4b7f963d50ee9ddf46 /src/output
parentd19b3df3b09913743a80adf79517ad5d11e3b619 (diff)
output/wasapi: remove the thread management code from DoDisable()
This is duplicate; this has already been done in Close().
Diffstat (limited to 'src/output')
-rw-r--r--src/output/plugins/wasapi/WasapiOutputPlugin.cxx13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
index 3314204fc..e023725bd 100644
--- a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
+++ b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx
@@ -391,17 +391,8 @@ WasapiOutput::WasapiOutput(const ConfigBlock &block)
void
WasapiOutput::DoDisable() noexcept
{
- if (thread) {
- try {
- thread->Finish();
- thread->Join();
- } catch (...) {
- LogError(std::current_exception(),
- "exception while disabling");
- }
- thread.reset();
- client.reset();
- }
+ assert(!thread);
+
device.reset();
enumerator.reset();
}