Merge tag 'v0.19.10'

This commit is contained in:
Max Kellermann
2015-06-21 16:01:44 +02:00
11 changed files with 108 additions and 16 deletions

View File

@@ -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())