From 04e8acc416eb279abb07090dabc970a37435c12e Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 1 Nov 2020 00:12:36 -0700 Subject: [PATCH] Fixed a bug where aborted audio tracks may be added to the filesystem cache. --- src/plugins/httpdatastream/HttpDataStream.cpp | 5 ++++- src/plugins/httpdatastream/HttpDataStream.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/httpdatastream/HttpDataStream.cpp b/src/plugins/httpdatastream/HttpDataStream.cpp index 5beba68aa..09e826609 100755 --- a/src/plugins/httpdatastream/HttpDataStream.cpp +++ b/src/plugins/httpdatastream/HttpDataStream.cpp @@ -403,7 +403,10 @@ void HttpDataStream::ThreadProc() { long httpStatusCode = 0; curl_easy_getinfo(this->curlEasy, CURLINFO_RESPONSE_CODE, &httpStatusCode); if (httpStatusCode == 200) { - this->state = State::Downloaded; + this->state = curlCode != CURLE_OK + ? State::Aborted + : State::Downloaded; + if (this->reader) { if (this->written > 0) { this->reader->Add(this->written); diff --git a/src/plugins/httpdatastream/HttpDataStream.h b/src/plugins/httpdatastream/HttpDataStream.h index 0c55ad777..179947e9b 100755 --- a/src/plugins/httpdatastream/HttpDataStream.h +++ b/src/plugins/httpdatastream/HttpDataStream.h @@ -79,6 +79,7 @@ class HttpDataStream : public IDataStream { Cached, Downloading, Retrying, + Aborted, Downloaded, Error, };