output_thread: check command before g_cond_wait()

After CANCEL, call g_cond_wait() only if the new command is still NONE. Problem is that ao_command_finished() has to unlock the audio_output object, and in the meantime, the player thread might have submitted a new command.

output_thread: check command before g_cond_wait()
d1742a23 · Max Kellermann · 5555d30b · d1742a23
Commit d1742a23 authored Nov 02, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

output_thread.c src/output_thread.c +2 -1

No files found.
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -455,7 +455,8 @@ static gpointer audio_output_task(gpointer arg)
 			/* the player thread will now clear our music
 			   pipe - wait for a notify, to give it some
 			   time */
-			g_cond_wait(ao->cond, ao->mutex);
+			if (ao->command == AO_COMMAND_NONE)
+				g_cond_wait(ao->cond, ao->mutex);
 			continue;

 		case AO_COMMAND_KILL: