7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-23 07:57:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

make cancelling not call error callback

Browse source
This commit is contained in:
matcool 2024-01-09 18:17:46 -03:00
parent 7ba832c9ee
commit 2540790ccb
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
loader/src/utils/web.cpp
View file

@ -357,7 +357,11 @@ SentAsyncWebRequest::Impl::Impl(SentAsyncWebRequest* self, AsyncWebRequest const
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code); curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code);
if (res != CURLE_OK) { if (res != CURLE_OK) {
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
return this->error("Fetch failed: " + std::string(curl_easy_strerror(res)), code); if (m_cancelled) {
return this->doCancel();
} else {
return this->error("Fetch failed: " + std::string(curl_easy_strerror(res)), code);
}
} }
if (code >= 400 && code < 600) { if (code >= 400 && code < 600) {
std::string response_str(ret.begin(), ret.end()); std::string response_str(ret.begin(), ret.end());
@ -409,8 +413,6 @@ void SentAsyncWebRequest::Impl::doCancel() {
l.lock(); l.lock();
} }
}); });
this->error("Request cancelled", -1);
} }
void SentAsyncWebRequest::Impl::cancel() { void SentAsyncWebRequest::Impl::cancel() {