From f8a1b81a79a44a941bc75f1c47f6c1bfe01692f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 3 Nov 2021 22:08:27 +0100
Subject: [PATCH] Fix writeToStdout()

---
 src/libmain/progress-bar.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc
index 37509a634..7cf88ec80 100644
--- a/src/libmain/progress-bar.cc
+++ b/src/libmain/progress-bar.cc
@@ -831,7 +831,13 @@ public:
 
     void writeToStdout(std::string_view s) override
     {
-        Logger::writeToStdout(s);
+        auto state(state_.lock());
+
+        if (state->active)
+            // Note: this assumes that stdout == stderr == a terminal
+            draw(*state, s);
+        else
+            Logger::writeToStdout(s);
     }
 
     std::optional<char> ask(std::string_view msg) override