Merge pull request #6336

760ecf2 console_handler: do not let exception past the dor (moneromooo-monero) 09c8111 threadpool: lock mutex in create (moneromooo-monero) e377977 tx_pool: catch theoretical error in get_block_reward (moneromooo-monero)
2020-03-31 15:14:12 -05:00
parent 94f44d4ee3 e3779775d7
commit 6c7d928f19
3 changed files with 13 additions and 4 deletions
@@ -606,11 +606,15 @@ eof:
    async_console_handler m_console_handler;
  public:
    ~console_handlers_binder() {
-      stop_handling();
-      if (m_console_thread.get() != nullptr)
+      try
      {
-        m_console_thread->join();
+        stop_handling();
+        if (m_console_thread.get() != nullptr)
+        {
+          m_console_thread->join();
+        }
      }
+      catch (const std::exception &e) { /* ignore */ }
    }

    bool start_handling(std::function<std::string(void)> prompt, const std::string& usage_string = "", std::function<void(void)> exit_handler = NULL)