diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-08-06T17·01+0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-06T17·01+0200 |
commit | 103ad1598c4708735412ffbb4f8ef9730ec071d2 (patch) | |
tree | 90c73fdb4b9bd18dca73ad3c85f9c30af7e48066 /src | |
parent | ed6c646f44e5b9e0fcbc53058491e97875a263c2 (diff) | |
parent | 4495560d6df5f89c3ae32b960f457fbc2f3fb831 (diff) |
Merge pull request #2334 from dtzWill/fix/revert-progress-bar-refresh-for-now
Revert "progress-bar: re-draw last update if nothing new for 1sec."
Diffstat (limited to 'src')
-rw-r--r-- | src/nix/progress-bar.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nix/progress-bar.cc b/src/nix/progress-bar.cc index 8093d8761c4d..40b905ba3243 100644 --- a/src/nix/progress-bar.cc +++ b/src/nix/progress-bar.cc @@ -75,10 +75,9 @@ public: updateThread = std::thread([&]() { auto state(state_.lock()); while (state->active) { - auto r = state.wait_for(updateCV, std::chrono::seconds(1)); + state.wait(updateCV); draw(*state); - if (r == std::cv_status::no_timeout) - state.wait_for(quitCV, std::chrono::milliseconds(50)); + state.wait_for(quitCV, std::chrono::milliseconds(50)); } }); } |