diff options
| author | Joel Klinghed <the_jk@yahoo.com> | 2017-07-29 01:40:26 +0200 |
|---|---|---|
| committer | Joel Klinghed <the_jk@yahoo.com> | 2017-07-29 01:40:26 +0200 |
| commit | c974e4b5df40aec646a60c747f453d11a8e7587c (patch) | |
| tree | edf74b51f6b449c5d8818cd0540e20a96bf7e6dd | |
| parent | 965e7208ad8a22c2e203e94258ec1dc42ee531ef (diff) | |
Print monitor errors to proxy log and statusbar
| -rw-r--r-- | src/monitor-gui.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/monitor-gui.cc b/src/monitor-gui.cc index d73c98d..450e96d 100644 --- a/src/monitor-gui.cc +++ b/src/monitor-gui.cc @@ -790,6 +790,7 @@ public: connect_->enable("unsecure", mitm); #endif // HAVE_SSL connect_->add_listener(lst.get()); + statusbar_->clear_override(); if (connect_->show(main_.get())) { monitor_->attach(); connect_.reset(); @@ -813,6 +814,7 @@ public: main_->config()->get("connect", ""), "Host and optional port (defaults to 9000)"); connect_->add_listener(lst.get()); + statusbar_->clear_override(); if (connect_->show(main_.get())) { monitor_->attach(); } else { @@ -825,6 +827,7 @@ public: monitor_->disconnect(); } proxy_.reset(); + statusbar_->clear_override(); } else if (id == ACTION_COPY_TEXT) { if (!has_selection_) { assert(false); @@ -977,8 +980,11 @@ public: menu_->enable_item(ACTION_DISCONNECT, allow_disconnect); } - void error(Monitor* monitor, std::string const& UNUSED(error)) override { + void error(Monitor* monitor, std::string const& error) override { assert(monitor == monitor_.get()); + if (!proxy_logger_) proxy_logger_.reset(new StringLogger()); + proxy_logger_->out(Logger::ERR, "%s", error.c_str()); + statusbar_->set_override(error); } void package(Monitor* monitor, ::Package const& package) override { |