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

669d7a6f · Max Kellermann · d600b937 · 669d7a6f
Commit 669d7a6f authored Jun 08, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Thread.cxx src/output/Thread.cxx +3 -3

No files found.
--- a/src/output/Thread.cxx
+++ b/src/output/Thread.cxx
@@ -77,9 +77,6 @@ AudioOutput::Enable()
 inline void
 AudioOutput::Disable() noexcept
 {
-	if (open)
-		Close(false);
-
 	if (really_enabled) {
 		really_enabled = false;

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