max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 22:16:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7793 from layus/interrupt_downloads

Browse source 
Check interrupts even when download stalled
This commit is contained in:
Eelco Dolstra 2023-02-28 13:29:29 +01:00 committed by GitHub
commit a4a5d828e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/filetransfer.cc
View file

@ -829,7 +829,7 @@ void FileTransfer::download(FileTransferRequest && request, Sink & sink)
{ {
auto state(_state->lock()); auto state(_state->lock());
while (state->data.empty()) { if (state->data.empty()) {
if (state->quit) { if (state->quit) {
if (state->exc) std::rethrow_exception(state->exc); if (state->exc) std::rethrow_exception(state->exc);
@ -837,6 +837,8 @@ void FileTransfer::download(FileTransferRequest && request, Sink & sink)
} }
state.wait(state->avail); state.wait(state->avail);
if (state->data.empty()) continue;
} }
chunk = std::move(state->data); chunk = std::move(state->data);