fixed bugs when seeking in very short streams, or very close to the end of stream

1 files changed, 2 insertions, 1 deletions

diff --git a/streamer.c b/streamer.c
index 7ca4cecf..cc0ff7ee 100644
--- a/streamer.c
+++ b/streamer.c
@@ -808,6 +808,7 @@ streamer_thread (void *ctx) {
                 }
             }
 
+            bytes_until_next_song = -1;
             streamer_buffering = 1;
             int trk = str_get_idx_of (streaming_track);
             if (trk != -1) {
@@ -863,7 +864,7 @@ streamer_thread (void *ctx) {
 //            if (streamer_buffering) trace ("fill: %d, read: %d, size=%d, blocksize=%d\n", streambuffer_fill, bytesread, STREAM_BUFFER_SIZE, blocksize);
         }
         streamer_unlock ();
-        if (streambuffer_fill > 128000 && streamer_buffering || !streaming_track) {
+        if ((streambuffer_fill > 128000 && streamer_buffering) || !streaming_track) {
             streamer_buffering = 0;
             if (streaming_track) {
                 int trk = str_get_idx_of (streaming_track);