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:
+2
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user