summaryrefslogtreecommitdiff
path: root/streamer.c
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2011-02-14 20:02:50 +0100
committerGravatar waker <wakeroid@gmail.com>2011-02-14 20:02:50 +0100
commit675c85585e2e79416604f6ed6b5c95ff3fafa64c (patch)
tree0eafe095a4caeae3935a045b3a560110a7233f56 /streamer.c
parent357133ac8dbb1dec6dfa41e3aeb88d890eee4bfa (diff)
vfs_curl fabort fix
Diffstat (limited to 'streamer.c')
-rw-r--r--streamer.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/streamer.c b/streamer.c
index 03ea23d7..f07708b9 100644
--- a/streamer.c
+++ b/streamer.c
@@ -130,12 +130,10 @@ streamer_abort_files (void) {
deadbeef->fabort (fileinfo->file);
trace ("\033[0;31maborting current song done\033[37;0m\n");
}
- mutex_lock (decodemutex);
if (streamer_file) {
trace ("\033[0;31maborting streamer_file\033[37;0m\n");
deadbeef->fabort (streamer_file);
}
- mutex_unlock (decodemutex);
}
void
@@ -732,8 +730,8 @@ void
streamer_set_nextsong (int song, int pstate) {
DB_output_t *output = plug_get_output ();
trace ("streamer_set_nextsong %d %d\n", song, pstate);
- streamer_lock ();
streamer_abort_files ();
+ streamer_lock ();
nextsong = song;
nextsong_pstate = pstate;
if (output->state () == OUTPUT_STATE_STOPPED) {