From 4495560d6df5f89c3ae32b960f457fbc2f3fb831 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 19 Jul 2018 10:29:31 -0500 Subject: Revert "progress-bar: re-draw last update if nothing new for 1sec." Not ready for this yet, causes the prompt to disappear in nix repl and more generally can overwrite non-progress-bar messages. This reverts commit 44de71a39624d86d6744062ee36f57170024c9a0. --- src/nix/progress-bar.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/nix') 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)); } }); } -- cgit 1.4.1