aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-06-21 16:01:44 +0200
committerMax Kellermann <max@duempel.org>2015-06-21 16:06:02 +0200
commit90e7ace980fcfe4f894cd8e882fbfd2efba0b57d (patch)
treeb4810dd7c6fb09329e0e2c986aa2e0c6cae579fd /src/output
parent2b0a127fa565c3e78d3a1e11f0fc68547dc5a161 (diff)
parentb0ff3bc7a30674fe44e946e228e8c2facd8e8377 (diff)
downloadmpd-90e7ace980fcfe4f894cd8e882fbfd2efba0b57d.tar.gz
mpd-90e7ace980fcfe4f894cd8e882fbfd2efba0b57d.tar.xz
mpd-90e7ace980fcfe4f894cd8e882fbfd2efba0b57d.zip
Merge tag 'v0.19.10'
Diffstat (limited to 'src/output')
-rw-r--r--src/output/OutputControl.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/output/OutputControl.cxx b/src/output/OutputControl.cxx
index 6da18e3a0..d7a114c01 100644
--- a/src/output/OutputControl.cxx
+++ b/src/output/OutputControl.cxx
@@ -186,7 +186,8 @@ AudioOutput::LockUpdate(const AudioFormat audio_format,
const ScopeLock protect(mutex);
if (enabled && really_enabled) {
- if (fail_timer.Check(REOPEN_AFTER * 1000)) {
+ if (!fail_timer.IsDefined() ||
+ fail_timer.Check(REOPEN_AFTER * 1000)) {
return Open(audio_format, mp);
}
} else if (IsOpen())