diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-06-19T07·13+0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-19T07·13+0200 |
commit | 629398d05cc7ed42d0b676b2f02ee8985d2668be (patch) | |
tree | c1f26f9d23a599eb2e8734593de88b2e54249e16 /src/nix | |
parent | 1fb475e7fce5050ae70cab3bb918ae2217f69123 (diff) | |
parent | 44de71a39624d86d6744062ee36f57170024c9a0 (diff) |
Merge pull request #2241 from dtzWill/feature/refresh-progress-bar
progress-bar: refresh occasionally even if no updates are received
Diffstat (limited to 'src/nix')
-rw-r--r-- | src/nix/progress-bar.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nix/progress-bar.cc b/src/nix/progress-bar.cc index 40b905ba3243..8093d8761c4d 100644 --- a/src/nix/progress-bar.cc +++ b/src/nix/progress-bar.cc @@ -75,9 +75,10 @@ public: updateThread = std::thread([&]() { auto state(state_.lock()); while (state->active) { - state.wait(updateCV); + auto r = state.wait_for(updateCV, std::chrono::seconds(1)); draw(*state); - state.wait_for(quitCV, std::chrono::milliseconds(50)); + if (r == std::cv_status::no_timeout) + state.wait_for(quitCV, std::chrono::milliseconds(50)); } }); } |