From 2902fcf71d9aaccc35d348d83bb35ec0099d11a6 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Wed, 1 Nov 2017 15:53:35 -0700 Subject: [PATCH] ircd/charybdis: Fix these stream manipulations. --- charybdis/console.cc | 4 ++-- ircd/logger.cc | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/charybdis/console.cc b/charybdis/console.cc index adcb05abb..df5f281ac 100644 --- a/charybdis/console.cc +++ b/charybdis/console.cc @@ -145,6 +145,7 @@ try console_active = false; console_in = nullptr; delete moi; moi = nullptr; + std::cin.clear(); }); console_active = true; @@ -171,6 +172,7 @@ try } std::getline(is, line); + std::cin.clear(); if(line.empty()) continue; @@ -187,8 +189,6 @@ catch(const std::exception &e) std::cout << std::flush; std::cout.clear(); - - std::cerr << std::flush; std::cerr.clear(); ircd::log::debug("The console session has ended: %s", e.what()); diff --git a/ircd/logger.cc b/ircd/logger.cc index e16965fcb..e368a0647 100644 --- a/ircd/logger.cc +++ b/ircd/logger.cc @@ -212,8 +212,6 @@ ircd::log::console_quiet::~console_quiet() std::cout << std::flush; std::cout.clear(); - - std::cerr << std::flush; std::cerr.clear(); } @@ -372,8 +370,6 @@ noexcept { err_console.clear(); write(err_console); - if(console_flush[fac]) - std::flush(err_console); } if(console_out[fac])