about summary refs log tree commit diff
path: root/src/nix/progress-bar.cc
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-07-19T15·29-0500
committerWill Dietz <w@wdtz.org>2018-07-19T15·29-0500
commit4495560d6df5f89c3ae32b960f457fbc2f3fb831 (patch)
treef69dfc575ed1262c888a0c1c73e84832b5eaa540 /src/nix/progress-bar.cc
parentc2de2ff385a7eed2cb5853d7fde203a6394698ea (diff)
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.
Diffstat (limited to 'src/nix/progress-bar.cc')
-rw-r--r--src/nix/progress-bar.cc5
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));
             }
         });
     }