aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-10-13 16:25:17 +0200
committerMax Kellermann <max@duempel.org>2009-10-13 16:25:17 +0200
commita61d0c95673aca05ff643550dd704e4436171c11 (patch)
tree97d52989e4bd913805dd02e06876395df0003c44
parenteea4edd92cd1cf32537e8870f90d7543af62cdc9 (diff)
parent6037beabe1b704093620704d279cda43d4874c4e (diff)
downloadmpd-a61d0c95673aca05ff643550dd704e4436171c11.tar.gz
mpd-a61d0c95673aca05ff643550dd704e4436171c11.tar.xz
mpd-a61d0c95673aca05ff643550dd704e4436171c11.zip
Merge branch 'v0.15.x'
Diffstat (limited to '')
-rw-r--r--NEWS1
-rw-r--r--src/input/curl_input_plugin.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 46f85ec09..b3231a676 100644
--- a/NEWS
+++ b/NEWS
@@ -47,6 +47,7 @@ ver 0.16 (20??/??/??)
ver 0.15.5 (2009/??/??)
* input:
- curl: don't abort if a packet has only metadata
+ - curl: fixed endless loop during buffering
* tags:
- riff, aiff: fixed "limited range" gcc warning
* decoder_thread: change the fallback decoder name to "mad"
diff --git a/src/input/curl_input_plugin.c b/src/input/curl_input_plugin.c
index 6cd2bc917..c3928a09b 100644
--- a/src/input/curl_input_plugin.c
+++ b/src/input/curl_input_plugin.c
@@ -310,7 +310,7 @@ fill_buffer(struct input_stream *is)
return false;
}
- return true;
+ return !g_queue_is_empty(c->buffers);
}
/**