oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/Thread: move Close() call out of Disable()

Browse Source
This commit is contained in:
Max Kellermann
2017-06-08 09:34:24 +02:00
parent d600b937f1
commit 669d7a6feb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/output/Thread.cxx
View File

@@ -77,9 +77,6 @@ AudioOutput::Enable()
inline void inline void
AudioOutput::Disable() noexcept AudioOutput::Disable() noexcept
{ {
if (open)
Close(false);
if (really_enabled) { if (really_enabled) {
really_enabled = false; really_enabled = false;
@@ -206,6 +203,9 @@ AudioOutput::OpenOutputAndConvert(AudioFormat desired_audio_format)
inline void inline void
AudioOutputControl::InternalDisable() noexcept AudioOutputControl::InternalDisable() noexcept
{ {
if (output->open)
output->Close(false);
output->Disable(); output->Disable();
} }