Merged release 0.15.5 from branch 'v0.15.x'

Conflicts:
	NEWS
	configure.ac
	src/decoder/flac_plugin.c
	src/update.c
This commit is contained in:
Max Kellermann
2009-10-18 19:02:43 +02:00
4 changed files with 16 additions and 10 deletions
+2 -1
View File
@@ -351,7 +351,8 @@ static gpointer audio_output_task(gpointer arg)
case AO_COMMAND_CANCEL:
ao->chunk = NULL;
ao_plugin_cancel(ao->plugin, ao->data);
if (ao->open)
ao_plugin_cancel(ao->plugin, ao->data);
ao_command_finished(ao);
/* the player thread will now clear our music