Merge branch 'unstable' into development

This commit is contained in:
Mike Brady
2019-02-16 14:07:21 +00:00
+1 -1
View File
@@ -1394,7 +1394,7 @@ int play(void *buf, int samples) {
// debug(3,"audio_alsa play called.");
int ret = 0;
pthread_cleanup_debug_mutex_lock(&alsa_mutex, 50000, 1);
pthread_cleanup_debug_mutex_lock(&alsa_mutex, 50000, 0);
if (alsa_backend_state == abm_disconnected) {
ret = do_open();