PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-15 01:22:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

Printhost: Cancelation, bugfixes

Browse Source
This commit is contained in:
Vojtech Kral
2018-12-20 13:36:49 +01:00
parent afc5ed0c62
commit 2d0dc6b050
6 changed files with 118 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/Utils/Http.cpp
View File

@@ -149,7 +149,9 @@ int Http::priv::xfercb(void *userp, curl_off_t dltotal, curl_off_t dlnow, curl_o
self->progressfn(progress, cb_cancel);
}
return self->cancel || cb_cancel;
if (cb_cancel) { self->cancel = true; }
return self->cancel;
}
int Http::priv::xfercb_legacy(void *userp, double dltotal, double dlnow, double ultotal, double ulnow)
@@ -278,7 +280,7 @@ void Http::priv::http_perform()
} else {
long http_status = 0;
::curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_status);
if (http_status >= 400) {
if (errorfn) { errorfn(std::move(buffer), std::string(), http_status); }
} else {